diff --git a/project.mml b/project.mml
index 0fb3f11423..eeaea55c84 100644
--- a/project.mml
+++ b/project.mml
@@ -341,33 +341,6 @@ Layer:
         ) AS water_barriers_poly
     properties:
       minzoom: 13
-  - id: springs
-    geometry: point
-    <<: *extents
-    Datasource:
-      <<: *osm2pgsql
-      table: |-
-        (SELECT
-            way,
-            "natural"
-          FROM
-          (SELECT
-              ST_PointOnSurface(way) AS way,
-              "natural"
-            FROM planet_osm_polygon
-            WHERE way && !bbox!
-            AND way_area < 768000*POW(!scale_denominator!*0.001*0.28,2)
-          UNION ALL
-          SELECT
-              way,
-              "natural"
-            FROM planet_osm_point
-            WHERE way && !bbox!
-            ) _
-          WHERE "natural" IN ('spring')
-        ) AS springs
-    properties:
-      minzoom: 14
   - id: piers-poly
     geometry: polygon
     <<: *extents
diff --git a/style/amenity-points.mss b/style/amenity-points.mss
index 1a7381c114..5ae03e9ccb 100644
--- a/style/amenity-points.mss
+++ b/style/amenity-points.mss
@@ -1381,6 +1381,11 @@
     marker-clip: false;
   }
 
+  [feature = 'natural_spring'][zoom >= 14] {
+    marker-file: url('symbols/spring.svg');
+    marker-clip: false;
+  }
+
   [feature = 'natural_cave_entrance'][zoom >= 15] {
     marker-file: url('symbols/natural/cave.svg');
     marker-clip: false;
diff --git a/style/water-features.mss b/style/water-features.mss
index 95ab6ffcd3..8cd93bcb89 100644
--- a/style/water-features.mss
+++ b/style/water-features.mss
@@ -158,10 +158,3 @@
     }
   }
 }
-
-#springs {
-  [natural = 'spring'][zoom >= 14] {
-    marker-file: url('symbols/spring.svg');
-    marker-clip: false;
-  }
-}