partially revert da3a849... commit to fix gps issues