--- a/src/hotspot/share/runtime/mutex.cpp	Wed Aug 14 11:14:54 2019 +0100
+++ b/src/hotspot/share/runtime/mutex.cpp	Wed Aug 14 10:07:00 2019 -0400
@@ -50,13 +50,6 @@
 void Monitor::lock(Thread * self) {
   check_safepoint_state(self, true);
 
-#ifdef CHECK_UNHANDLED_OOPS
-  // Clear unhandled oops in JavaThreads so we get a crash right away.
-  if (self->is_active_Java_thread()) {
-    self->clear_unhandled_oops();
-  }
-#endif // CHECK_UNHANDLED_OOPS
-
   DEBUG_ONLY(check_prelock_state(self, true));
   assert(_owner != self, "invariant");
 
@@ -196,11 +189,6 @@
   guarantee(self->is_active_Java_thread(), "invariant");
   assert_wait_lock_state(self);
 
-#ifdef CHECK_UNHANDLED_OOPS
-  // Clear unhandled oops in JavaThreads so we get a crash right away.
-  self->clear_unhandled_oops();
-#endif // CHECK_UNHANDLED_OOPS
-
   int wait_status;
   // conceptually set the owner to NULL in anticipation of
   // abdicating the lock in wait