--- old/src/hotspot/share/runtime/safepoint.cpp	2020-04-06 14:31:49.585575309 +0000
+++ new/src/hotspot/share/runtime/safepoint.cpp	2020-04-06 14:31:48.682553604 +0000
@@ -463,8 +463,6 @@
       assert(!cur_state->is_running(), "Thread not suspended at safepoint");
       cur_state->restart(); // TSS _running
       assert(cur_state->is_running(), "safepoint state has not been reset");
-
-      SafepointMechanism::disarm_if_needed(current, false /* NO release */);
     }
   } // ~JavaThreadIteratorWithHandle
 
@@ -705,7 +703,6 @@
 }
 
 bool SafepointSynchronize::handshake_safe(JavaThread *thread) {
-  assert(Thread::current()->is_VM_thread(), "Must be VMThread");
   if (thread->is_ext_suspended() || thread->is_terminated()) {
     return true;
   }