Revert "Improve GPS"

This reverts commit 8f613f9d6faf8669b1daa4f1682678a7cb136e71.