Revert "GPS fixes"

This reverts commit 11ab93750883784ce7e5e53e9beb2b1709369aa2.