Revert "Reset location"

This reverts commit 5f5faab426df4e9dd5e830a84fcded8a2bcabcb4.
Revert "Revert "Reset location""

This reverts commit 817e5927fba7771b435346ead29b593ecc0d273e.