--- old/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp	2018-03-05 13:50:18.154107820 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp	2018-03-05 13:50:17.983105003 +0100
@@ -934,7 +934,6 @@
     FLAG_SET_DEFAULT(ShenandoahSATBBarrier, false);
     FLAG_SET_DEFAULT(ShenandoahStoreValWriteBarrier, true);
     FLAG_SET_DEFAULT(ShenandoahStoreValReadBarrier, false);
-    FLAG_SET_DEFAULT(ShenandoahAsmWB, false);
 
     SHENANDOAH_ERGO_OVERRIDE_DEFAULT(ShenandoahRefProcFrequency, 1);
     // TODO: Disable this optimization for now, as it also requires the matrix barriers.
@@ -1310,7 +1309,6 @@
     FLAG_SET_DEFAULT(ShenandoahStoreValWriteBarrier,   false);
     FLAG_SET_DEFAULT(ShenandoahStoreValEnqueueBarrier, true);
     FLAG_SET_DEFAULT(ShenandoahKeepAliveBarrier,       false);
-    FLAG_SET_DEFAULT(ShenandoahAsmWB,                  true);
     FLAG_SET_DEFAULT(ShenandoahBarriersForConst,       true);
     FLAG_SET_DEFAULT(ShenandoahWriteBarrierRB,         false);
     FLAG_SET_DEFAULT(ShenandoahAllocImplicitLive,      false);