diff --git a/source/sw/src/cheats.cpp b/source/sw/src/cheats.cpp
index c929c7a5f..b1e04bb45 100644
--- a/source/sw/src/cheats.cpp
+++ b/source/sw/src/cheats.cpp
@@ -96,13 +96,7 @@ void PrevCheat(PLAYERp pp, const char *)
 
 void MapCheat(PLAYERp pp, const char *)
 {
-    automapping ^= 1;
-
-    if (automapping)
-        MapSetAll2D(0);
-    else
-        MapSetAll2D(0xFF);
-
+    // Need to do this differently. The code here was completely broken.
     PutStringInfo(pp, GStrings(automapping ? "TXT_AMON" : "TXT_AMOFF"));
 }
 
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index 0e3c3ca3c..ac926c5e4 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -559,6 +559,7 @@ Distance(int x1, int y1, int x2, int y2)
 void
 MapSetAll2D(uint8_t fill)
 {
+#if 0
     int i;
 
     for (i = 0; i < (MAXWALLS >> 3); i++)
@@ -573,6 +574,7 @@ MapSetAll2D(uint8_t fill)
             show2dsector[i>>3] |= (1<<(i&7));
         //show2dsector[i] = fill;
     }
+#endif
 }
 
 void
@@ -2751,6 +2753,7 @@ int32_t GameInterface::app_main()
     int cnt = 0;
     uint32_t TotalMemory;
 
+    automapping = 1;
     BorderAdjust = true;
     SW_ExtInit();