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

This reverts commit d7539068b5405cf1e2abc8b85dc16c04457cb538.