Pushing emergency fix for geocoder

Google changed the way the geocoder returns results which broke our
custom locations. Pushing this to master as well.