diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
index eaac7c16db9..dcc506f23d4 100644
--- a/data/core/terrain-graphics.cfg
+++ b/data/core/terrain-graphics.cfg
@@ -437,8 +437,8 @@
 # experimental macro using 1-hex rule to optimize water animation
 {GENERIC_SINGLEHEX_PLFB (Wo)         100 -1000 base ANIMATION_15_SLOW           water/ocean}
 {GENERIC_SINGLEHEX_PLFB (Wot)        100 -1000 base ANIMATION_15_SLOW           water/ocean-tropical}
-{GENERIC_SINGLEHEX_PLFB (Ww,Wwr)     100 -1000 base ANIMATION_15                water/coast}
-{ANIMATED_WATER_15      (Wwm)        "~CS(40,0,-30)"                    110    water/coast-tropical}
+#{GENERIC_SINGLEHEX_PLFB (Ww,Wwr)     100 -1000 base ANIMATION_15                water/coast}
+{ANIMATED_WATER_15      (Ww,Wwr)     "~CS(40,0,-30)"                    110    water/coast-tropical}
 {ANIMATED_WATER_15      (Wwg)        "~CS(65,5,-45)"                   110    water/coast-tropical}
 # water animation under ford is not really visible, so we disable it for now
 {GENERIC_SINGLEHEX_PLFB (Wwf)        100 -1000 base ANIMATION_01                water/coast}
@@ -788,16 +788,16 @@
 {TRANSITION_COMPLETE_LF       Dd,Ds,Hd           (!,D*,Hd,!,W*,S*)                -550   double                sand/sand-to-water}
 {ANIMATED_WATER_15_TRANSITION Wo                 (!,Wo,!,W*,S*,D*,Hd)             -551 ()                  110 water/ocean-blend}
 {ANIMATED_WATER_15_TRANSITION Wot                (!,Wot,!,W*,S*,D*,Hd)            -551 ()                  110 water/ocean-tropical-blend}
-{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr         (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd)     -552 ()                  110 water/coast-long}
-{ANIMATED_WATER_15_TRANSITION Wwm                (!,Wwm,!,W*,S*,D*,Hd)            -553 "~CS(40,0,-30)"    110 water/coast-tropical-long}
+#{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr         (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd)     -552 ()                  110 water/coast-long}
+{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr         (!,Wwm,!,W*,S*,D*,Hd)            -553 "~CS(40,0,-30)"    110 water/coast-tropical-long}
 {ANIMATED_WATER_15_TRANSITION Wwg                (!,Wwg,!,W*,S*,D*,Hd)            -554 "~CS(65,5,-45)"   110 water/coast-tropical-long}
 {ANIMATED_WATER_15_TRANSITION Wwt                (!,Wwt,!,W*,S*,D*,Hd)            -555 ()                  110 water/coast-tropical-long}
 {ANIMATED_WATER_15_TRANSITION Ss                 (!,Ss,!,W*,D*,Hd)                -556 ()                  110 swamp/water-long}
 {ANIMATED_WATER_15_TRANSITION Ss                 (!,Ss,!,W*,D*,Hd)                -557 ()                  110 swamp/water-long}
 {ANIMATED_WATER_15_TRANSITION Wwt                (!,Wwt,!,W*,S*,D*,Hd)            -560 ()                  110 water/coast-tropical-long}
 {ANIMATED_WATER_15_TRANSITION Wwg                (!,Wwg,!,W*,S*,D*,Hd)            -558 "~CS(65,5,-45)"   110 water/coast-tropical-long}
-{ANIMATED_WATER_15_TRANSITION Wwm                (!,Wwm,!,W*,S*,D*,Hd)            -559 "~CS(40,0,-30)"    110 water/coast-tropical-long}
-{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr         (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd)     -561 ()                  110 water/coast-long}
+{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr         (!,Wwm,!,W*,S*,D*,Hd)            -559 "~CS(40,0,-30)"    110 water/coast-tropical-long}
+#{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr         (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd)     -561 ()                  110 water/coast-long}
 {ANIMATED_WATER_15_TRANSITION Wot                (!,Wot,!,W*,S*,D*,Hd)            -562 ()                  110 water/ocean-tropical-blend}
 {ANIMATED_WATER_15_TRANSITION Wo                 (!,Wo,!,W*,S*,D*,Hd)             -563 ()                  110 water/ocean-blend}
 {TRANSITION_COMPLETE_L        Dd,Ds,Hd           (!,D*,Hd,!,W*,Ss)                -564                         sand/sand-to-water}
diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg
index 7550e2168ca..7baa5e8346f 100644
--- a/data/core/terrain.cfg
+++ b/data/core/terrain.cfg
@@ -45,17 +45,6 @@
     editor_group=water
 [/terrain_type]
 
-[terrain_type]
-    symbol_image=water/coast-medium-tile
-    id=medium_tropical_water
-    name= _ "Medium Shallow Water"
-#   editor_name= _ "Medium Shallow Water"
-    string=Wwm
-    aliasof=Ww
-    submerge=0.4
-    editor_group=water
-[/terrain_type]
-
 [terrain_type]
     symbol_image=water/coast
     id=shallow_water
@@ -65,6 +54,17 @@
     editor_group=water
 [/terrain_type]
 
+#[terrain_type]
+#    symbol_image=water/coast-medium-tile
+#    id=medium_tropical_water
+#    name= _ "Medium Shallow Water"
+#   editor_name= _ "Medium Shallow Water"
+#    string=Wwm
+#    aliasof=Ww
+#    submerge=0.4
+#    editor_group=water
+#[/terrain_type]
+
 [terrain_type]
     symbol_image=water/coast-grey-tile
     id=gray_tropical_water
@@ -76,6 +76,7 @@
     editor_group=water
 [/terrain_type]
 
+
 [terrain_type]
     symbol_image=water/ford-tile
     id=ford