Revert "GPS Support rebased [2/2]"

This reverts commit 1eb47fd57f04bcb71516ebedef2bd599278d29fc.