Revert: "do not use GPS if Play Services is available"