--- a/src/hotspot/share/runtime/thread.cpp	Wed Oct 31 09:09:23 2018 +0100
+++ b/src/hotspot/share/runtime/thread.cpp	Wed Oct 31 08:09:45 2018 +0100
@@ -4276,9 +4276,6 @@
   before_exit(thread);
 
   thread->exit(true);
-  // thread will never call smr_delete, instead of implicit cancel
-  // in wait_for_vm_thread_exit we do it explicit.
-  thread->cancel_handshake();
 
   // Stop VM thread.
   {