--- a/src/hotspot/share/gc/shared/workgroup.hpp	Tue Aug 28 21:25:37 2018 -0700
+++ b/src/hotspot/share/gc/shared/workgroup.hpp	Wed Aug 29 08:00:00 2018 +0200
@@ -154,8 +154,6 @@
   virtual uint active_workers() const {
     assert(_active_workers <= _total_workers,
            "_active_workers: %u > _total_workers: %u", _active_workers, _total_workers);
-    assert(UseDynamicNumberOfGCThreads || _active_workers == _total_workers,
-           "Unless dynamic should use total workers");
     return _active_workers;
   }
 

--- a/src/hotspot/share/gc/z/zArguments.cpp	Tue Aug 28 21:25:37 2018 -0700
+++ b/src/hotspot/share/gc/z/zArguments.cpp	Wed Aug 29 08:00:00 2018 +0200
@@ -76,9 +76,6 @@
   }
 #endif
 
-  // To avoid asserts in set_active_workers()
-  FLAG_SET_DEFAULT(UseDynamicNumberOfGCThreads, true);
-
   // CompressedOops/UseCompressedClassPointers not supported
   FLAG_SET_DEFAULT(UseCompressedOops, false);
   FLAG_SET_DEFAULT(UseCompressedClassPointers, false);