--- old/src/hotspot/share/runtime/globals.hpp	2017-10-30 15:12:31.503403722 +0100
+++ new/src/hotspot/share/runtime/globals.hpp	2017-10-30 15:12:31.248395341 +0100
@@ -598,7 +598,7 @@
   develop(bool, CleanChunkPoolAsync, true,                                  \
           "Clean the chunk pool asynchronously")                            \
                                                                             \
-  product(bool, ThreadLocalHandshakes, false,                               \
+  product(bool, ThreadLocalHandshakes, true,                                \
           "Use thread-local polls instead of global poll for safepoints.")  \
           constraint(ThreadLocalHandshakesConstraintFunc,AfterErgo)         \
                                                                             \