diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
index 925b397c9..c26989102 100644
--- a/config/initializers/geocoder.rb
+++ b/config/initializers/geocoder.rb
@@ -1,5 +1,10 @@
 Geocoder.configure(
-  :units => :km
+  :units => :km,
+  :http_headers => {
+    "User-Agent" =>
+      "#{Growstuff::Application.config.user_agent} #{Growstuff::Application.config.user_agent_email}",
+    "From" => Growstuff::Application.config.user_agent_email
+  }
 )
 # This configuration takes precedence over environment/test.rb
 # Reported as https://github.com/alexreisner/geocoder/issues/509
diff --git a/config/initializers/nominatim.rb b/config/initializers/nominatim.rb
deleted file mode 100644
index 2c4c954a4..000000000
--- a/config/initializers/nominatim.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'nominatim'
-
-Nominatim.user_agent = Growstuff::Application.config.user_agent
-Nominatim.user_agent_email = Growstuff::Application.config.user_agent_email
diff --git a/lib/nominatim.rb b/lib/nominatim.rb
deleted file mode 100644
index 4f969eb5d..000000000
--- a/lib/nominatim.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'open-uri'
-require 'json'
-
-class Nominatim
-
-  # class-level instance variable, see
-  # http://www.railstips.org/blog/archives/2006/11/18/class-and-instance-variables-in-ruby/
-  class << self
-    attr_accessor :in_testing
-    attr_accessor :user_agent
-    attr_accessor :user_agent_email
-  end
-  @in_testing = false
-
-  def self.geocode(place)
-    if self.in_testing
-      return stubs[place]
-    end
-    json = open(
-      URI.escape("http://nominatim.openstreetmap.org/search/#{place}?format=json&limit=1"),
-      "User-Agent" => user_agent,
-      "From" => user_agent_email
-    ).read()
-    location = JSON.parse(json)
-    if location && location[0]
-      return {
-        :latitude => location[0]['lat'],
-        :longitude => location[0]['lon'],
-        :boundingbox => location[0]['boundingbox'],
-      }
-    else
-      return nil
-    end
-  end
-
-  def self.stubs
-    @stubs ||= {}
-  end
-
-  def self.add_stub(query_text, results)
-    stubs[query_text] = results
-  end
-end