Revert "Workaround until gps can be fixed, force gps to stay in standalone mode when"

This reverts commit d4aabc815cfb7e95ab92a35df53ce4ceb83e086f.