Revert "GPS fixes"

This reverts commit 03f561c32dfa4fe6d2cacfa5c8749a3961b70b31.