Revert "Let actually use our GPS. This fixes GPS on G2 and other s800 devices."

This reverts commit 8f960adc5b65a61b70cf719c32e877481feab36e.

Change-Id: I18e85c323ac596b03dce29c8e54aa0712c318558