Google Maps fix

This finally properly fixes Google Maps and defaults to Google Maps again. @DonLakeFlyer @Susurrus Please merge at will.
Why is this commented out? Should this code be here? The other cases actually call this function.