remove gps hack

 * now handled correctly via cherry-pick