Revert "GPS fixes"

This reverts commit 4b3aaa21582a85176694b6fe366c714c0b496165.