--- old/src/share/vm/runtime/thread.cpp	2019-11-11 16:10:15.686341854 +0100
+++ new/src/share/vm/runtime/thread.cpp	2019-11-11 16:10:15.598341859 +0100
@@ -1956,7 +1956,7 @@
   // from the list of active threads. We must do this after any deferred
   // card marks have been flushed (above) so that any entries that are
   // added to the thread's dirty card queue as a result are not lost.
-  if (UseG1GC || (UseShenandoahGC && ShenandoahSATBBarrier)) {
+  if (UseG1GC || (UseShenandoahGC)) {
     flush_barrier_queues();
   }
   if (UseShenandoahGC && UseTLAB && gclab().is_initialized()) {
@@ -2046,7 +2046,7 @@
   }
 
 #if INCLUDE_ALL_GCS
-  if (UseG1GC || (UseShenandoahGC && ShenandoahSATBBarrier)) {
+  if (UseG1GC || (UseShenandoahGC)) {
     flush_barrier_queues();
   }
   if (UseShenandoahGC && UseTLAB && gclab().is_initialized()) {