--- old/src/hotspot/share/gc/z/zArguments.cpp	2018-05-11 11:13:13.574599063 +0200
+++ new/src/hotspot/share/gc/z/zArguments.cpp	2018-05-11 11:13:13.346589182 +0200
@@ -62,15 +62,9 @@
   // Enable loop strip mining by default
   if (FLAG_IS_DEFAULT(UseCountedLoopSafepoints)) {
     FLAG_SET_DEFAULT(UseCountedLoopSafepoints, true);
-#if 0
     if (FLAG_IS_DEFAULT(LoopStripMiningIter)) {
       FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
     }
-#else
-    // NOTE! Loop strip mining is temporarily disabled
-    // until JDK-8193935 and JDK-8201532 have be fixed
-    FLAG_SET_DEFAULT(LoopStripMiningIter, 1);
-#endif
   }
 #endif