--- old/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp	2020-05-25 21:02:52.612231134 +0200
+++ new/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp	2020-05-25 21:02:52.188229797 +0200
@@ -143,20 +143,12 @@
 #endif // ASSERT
 #endif // COMPILER2
 
-  if (AlwaysPreTouch) {
-    // Shenandoah handles pre-touch on its own. It does not let the
-    // generic storage code to do the pre-touch before Shenandoah has
-    // a chance to do it on its own.
-    FLAG_SET_DEFAULT(AlwaysPreTouch, false);
-    FLAG_SET_DEFAULT(ShenandoahAlwaysPreTouch, true);
-  }
-
   // Record more information about previous cycles for improved debugging pleasure
   if (FLAG_IS_DEFAULT(LogEventsBufferEntries)) {
     FLAG_SET_DEFAULT(LogEventsBufferEntries, 250);
   }
 
-  if (ShenandoahAlwaysPreTouch) {
+  if (AlwaysPreTouch) {
     if (!FLAG_IS_DEFAULT(ShenandoahUncommit)) {
       warning("AlwaysPreTouch is enabled, disabling ShenandoahUncommit");
     }