Revert "Location update"

This reverts commit f2aae690ae006a02363bdf135647b061bb610aad.
Revert "Revert "Location update""

This reverts commit f0f3eb4894f7fa2adba4167f4af4b20bb3204a6a.
Revert "Revert "Revert "Location update"""

This reverts commit 4d79656dadbfadb616aaa94ccd758f7715b8bb21.