Revert my derp and fix GPS build