--- a/src/hotspot/share/prims/jvmtiExport.cpp	Wed Feb 07 16:03:12 2018 +0100
+++ b/src/hotspot/share/prims/jvmtiExport.cpp	Wed Feb 07 10:25:10 2018 -0800
@@ -597,12 +597,10 @@
 }
 
 void JvmtiExport::enter_early_start_phase() {
-  JvmtiManageCapabilities::recompute_always_capabilities();
   set_early_vmstart_recorded(true);
 }
 
 void JvmtiExport::enter_start_phase() {
-  JvmtiManageCapabilities::recompute_always_capabilities();
   JvmtiEnvBase::set_phase(JVMTI_PHASE_START);
 }