CRM-19784: Updated direct usages of the geocoding provider to use the