Revert "Revert "Revert "Update location module."""

This reverts commit e101a26d84452c0a08d5d8e9df6fd1dabaa80192.