Revert "Revert "Update location module.""

This reverts commit d3eae97f0cf8c68657110b0ee151380ad0d98cdd.