--- a/src/hotspot/share/runtime/sweeper.cpp	Thu Dec 20 10:41:45 2018 +0100
+++ b/src/hotspot/share/runtime/sweeper.cpp	Thu Dec 20 10:41:45 2018 +0100
@@ -717,12 +717,6 @@
     // stack we can safely convert it to a zombie method
     OrderAccess::loadload(); // _stack_traversal_mark and _state
     if (cm->can_convert_to_zombie()) {
-      // Clear ICStubs to prevent back patching stubs of zombie or flushed
-      // nmethods during the next safepoint (see ICStub::finalize).
-      {
-        CompiledICLocker ml(cm);
-        cm->clear_ic_stubs();
-      }
       // Code cache state change is tracked in make_zombie()
       cm->make_zombie();
       SWEEP(cm);