Revert "Changes to support updating location providers."

This reverts commit c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
6 files changed