Revert "Revert "GPS handling fix from Brood""

This reverts commit 76a79f634646a99fbfd4bb944cb77457cc62cec9.