--- a/src/hotspot/share/gc/g1/g1Arguments.cpp	Thu Dec 07 10:18:31 2017 +0100
+++ b/src/hotspot/share/gc/g1/g1Arguments.cpp	Thu Dec 07 15:52:46 2017 +0100
@@ -98,9 +98,9 @@
   // Enable loop strip mining to offer better pause time guarantees
   if (FLAG_IS_DEFAULT(UseCountedLoopSafepoints)) {
     FLAG_SET_DEFAULT(UseCountedLoopSafepoints, true);
-  }
-  if (UseCountedLoopSafepoints && FLAG_IS_DEFAULT(LoopStripMiningIter)) {
-    FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
+    if (FLAG_IS_DEFAULT(LoopStripMiningIter)) {
+      FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
+    }
   }
 #endif
 }