--- old/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	2020-05-25 21:02:53.884235138 +0200
+++ new/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	2020-05-25 21:02:53.452233779 +0200
@@ -155,7 +155,7 @@
 
   size_t reg_size_bytes = ShenandoahHeapRegion::region_size_bytes();
 
-  if (ShenandoahAlwaysPreTouch) {
+  if (AlwaysPreTouch) {
     // Enabled pre-touch means the entire heap is committed right away.
     init_byte_size = max_byte_size;
   }
@@ -344,9 +344,7 @@
     _free_set->rebuild();
   }
 
-  if (ShenandoahAlwaysPreTouch) {
-    assert(!AlwaysPreTouch, "Should have been overridden");
-
+  if (AlwaysPreTouch) {
     // For NUMA, it is important to pre-touch the storage under bitmaps with worker threads,
     // before initialize() below zeroes it with initializing thread. For any given region,
     // we touch the region and the corresponding bitmaps from the same thread.