diff --git a/location.module b/location.module
index 1d8ff20d0dd3eaefd1e6d9d22cd70fb03fe789bb..cfb3737e908653bed502e976ef838debd77b8762 100644
--- a/location.module
+++ b/location.module
@@ -1217,6 +1217,13 @@ function location_save(&$location, $cow = TRUE, $criteria = array()) {
 
   $inhibit_geocode = FALSE;
 
+  if (isset($location['inhibit_geocode']) && $location['inhibit_geocode']) {
+    // Workaround for people importing / generating locations.
+    // Allows things like location_generate.module to work properly.
+    $inhibit_geocode = TRUE;
+    unset($location['inhibit_geocode']);
+  }
+
   if (isset($location['delete_location']) && $location['delete_location']) {
     // Location is being deleted.
     // Consider it empty and return early.