Revert "Revert "Revert "Reset location"""

This reverts commit bf3be8bf7f2cea913934e708a566b422c3b908d0.