This shouldn't be in the same patch as changing a geocoding service.