Revert "gps: Updates from mr1 branch"

This reverts commit 99be7b7be0a1e944358c4caa198cb9b88e5a75c5.