Revert "GPS handling fix from Brood"

This reverts commit a609c8007ca0ae9e2ceec7e9158065b84430c35a.