--- old/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp	2020-05-26 14:38:27.255617424 -0400
+++ new/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp	2020-05-26 14:38:27.058616259 -0400
@@ -235,17 +235,8 @@
   assert(clds != NULL, "Only possible with CLD closure");
   _cld_roots.cld_do(clds, worker_id);
 
-  // With ShenandoahConcurrentScanCodeRoots, we avoid scanning the entire code cache here,
-  // and instead do that in concurrent phase under the relevant lock. This saves init mark
-  // pause time.
-  if (code != NULL && !ShenandoahConcurrentScanCodeRoots) {
-    _code_roots.code_blobs_do(code, worker_id);
-    ShenandoahParallelOopsDoThreadClosure tc_cl(oops, NULL, tc);
-    _thread_roots.threads_do(&tc_cl, worker_id);
-  } else {
-    ShenandoahParallelOopsDoThreadClosure tc_cl(oops, code, tc);
-    _thread_roots.threads_do(&tc_cl, worker_id);
-  }
+  ShenandoahParallelOopsDoThreadClosure tc_cl(oops, code, tc);
+  _thread_roots.threads_do(&tc_cl, worker_id);
 
   AlwaysTrueClosure always_true;
   _dedup_roots.oops_do(&always_true, oops, worker_id);