diff --git a/modules/farm/farm_area/farm_area.features.field_instance.inc b/modules/farm/farm_area/farm_area.features.field_instance.inc
index f8de19ca7..ce69e5495 100644
--- a/modules/farm/farm_area/farm_area.features.field_instance.inc
+++ b/modules/farm/farm_area/farm_area.features.field_instance.inc
@@ -118,12 +118,9 @@ function farm_area_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'hidden',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 0,
       ),
     ),
diff --git a/modules/farm/farm_area/farm_area.info b/modules/farm/farm_area/farm_area.info
index 4d3d75c5b..a6f1f3a48 100644
--- a/modules/farm/farm_area/farm_area.info
+++ b/modules/farm/farm_area/farm_area.info
@@ -7,6 +7,7 @@ dependencies[] = ctools
 dependencies[] = farm_fields
 dependencies[] = farm_flags
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_quantity
 dependencies[] = farm_term
diff --git a/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc b/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc
index 7ff5b4fb3..a2d9198f9 100644
--- a/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc
+++ b/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc
@@ -417,12 +417,9 @@ function farm_equipment_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 10,
       ),
     ),
diff --git a/modules/farm/farm_equipment/farm_equipment.info b/modules/farm/farm_equipment/farm_equipment.info
index e5b3bef7f..481c9881e 100644
--- a/modules/farm/farm_equipment/farm_equipment.info
+++ b/modules/farm/farm_equipment/farm_equipment.info
@@ -16,6 +16,7 @@ dependencies[] = farm_flags
 dependencies[] = farm_group
 dependencies[] = farm_inventory
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_movement
 dependencies[] = features
diff --git a/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc b/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc
index 170a925db..a7c0cfa89 100644
--- a/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc
+++ b/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc
@@ -674,12 +674,9 @@ function farm_livestock_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 12,
       ),
     ),
diff --git a/modules/farm/farm_livestock/farm_livestock.info b/modules/farm/farm_livestock/farm_livestock.info
index 236bd7498..40382f838 100644
--- a/modules/farm/farm_livestock/farm_livestock.info
+++ b/modules/farm/farm_livestock/farm_livestock.info
@@ -17,6 +17,7 @@ dependencies[] = farm_flags
 dependencies[] = farm_group
 dependencies[] = farm_inventory
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_movement
 dependencies[] = farm_quantity_log
diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
index 0319941c7..5bbbc476b 100644
--- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
@@ -160,12 +160,9 @@ function farm_log_activity_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 12,
       ),
     ),
diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.info b/modules/farm/farm_log/farm_log_activity/farm_log_activity.info
index fa983c067..2a66c2135 100644
--- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.info
+++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.info
@@ -18,6 +18,7 @@ dependencies[] = farm_flags
 dependencies[] = farm_group
 dependencies[] = farm_inventory
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_movement
 dependencies[] = farm_quantity
diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
index e8a224639..45f872464 100644
--- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
@@ -171,12 +171,9 @@ function farm_log_harvest_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 12,
       ),
       'token' => array(
diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info
index 5bd1ca447..a606d5f1f 100644
--- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info
+++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info
@@ -17,6 +17,7 @@ dependencies[] = farm_fields
 dependencies[] = farm_flags
 dependencies[] = farm_inventory
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_movement
 dependencies[] = farm_quantity
diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
index d364380d6..2f9bdc868 100644
--- a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
@@ -226,12 +226,9 @@ function farm_log_input_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 17,
       ),
       'token' => array(
diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.info b/modules/farm/farm_log/farm_log_input/farm_log_input.info
index a7384bb86..8e5f05d55 100644
--- a/modules/farm/farm_log/farm_log_input/farm_log_input.info
+++ b/modules/farm/farm_log/farm_log_input/farm_log_input.info
@@ -17,6 +17,7 @@ dependencies[] = farm_fields
 dependencies[] = farm_flags
 dependencies[] = farm_inventory
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_movement
 dependencies[] = farm_quantity
diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
index 044ed84e9..e107f7b87 100644
--- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
@@ -160,12 +160,9 @@ function farm_log_observation_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 12,
       ),
     ),
diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.info b/modules/farm/farm_log/farm_log_observation/farm_log_observation.info
index 0d5c0399a..ec8e17cf8 100644
--- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.info
+++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.info
@@ -18,6 +18,7 @@ dependencies[] = farm_flags
 dependencies[] = farm_group
 dependencies[] = farm_inventory
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_movement
 dependencies[] = farm_quantity
diff --git a/modules/farm/farm_movement/farm_movement.features.field_instance.inc b/modules/farm/farm_movement/farm_movement.features.field_instance.inc
index 49773a927..6bf0a99b4 100644
--- a/modules/farm/farm_movement/farm_movement.features.field_instance.inc
+++ b/modules/farm/farm_movement/farm_movement.features.field_instance.inc
@@ -20,12 +20,9 @@ function farm_movement_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 2,
       ),
     ),
diff --git a/modules/farm/farm_movement/farm_movement.info b/modules/farm/farm_movement/farm_movement.info
index 1a18d1747..c421fac3f 100644
--- a/modules/farm/farm_movement/farm_movement.info
+++ b/modules/farm/farm_movement/farm_movement.info
@@ -14,6 +14,7 @@ dependencies[] = farm_asset
 dependencies[] = farm_fields
 dependencies[] = farm_log
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = features
 dependencies[] = field_collection
diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc
index 3b3d0c755..86a87d355 100644
--- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc
+++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc
@@ -118,12 +118,9 @@ function farm_soil_test_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 1,
       ),
     ),
diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info
index 34721b6aa..753ccb340 100644
--- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info
+++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info
@@ -11,6 +11,7 @@ dependencies[] = farm_area
 dependencies[] = farm_fields
 dependencies[] = farm_flags
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_soil
 dependencies[] = features
diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc
index 11f4b061e..d1c64c55b 100644
--- a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc
+++ b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc
@@ -117,12 +117,9 @@ function farm_water_test_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'openlayers_geofield',
-        'settings' => array(
-          'data' => 'full',
-          'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
-        ),
-        'type' => 'openlayers_geofield',
+        'module' => 'farm_map_geofield',
+        'settings' => array(),
+        'type' => 'farm_map_geofield',
         'weight' => 1,
       ),
     ),
diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.info b/modules/farm/farm_water/farm_water_test/farm_water_test.info
index 74a865edb..18a9576c1 100644
--- a/modules/farm/farm_water/farm_water_test/farm_water_test.info
+++ b/modules/farm/farm_water/farm_water_test/farm_water_test.info
@@ -10,6 +10,7 @@ dependencies[] = farm_area
 dependencies[] = farm_fields
 dependencies[] = farm_flags
 dependencies[] = farm_map
+dependencies[] = farm_map_geofield
 dependencies[] = farm_map_kml
 dependencies[] = farm_water
 dependencies[] = features