--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp	Wed Mar 15 11:44:46 2017 +0100
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp	Wed Mar 15 10:25:37 2017 -0400
@@ -324,7 +324,7 @@
   // load VMSupport
   Symbol* klass = vmSymbols::jdk_internal_vm_VMSupport();
   Klass* k = SystemDictionary::resolve_or_fail(klass, true, CHECK);
-  instanceKlassHandle ik (THREAD, k);
+  InstanceKlass* ik = InstanceKlass::cast(k);
   if (ik->should_be_initialized()) {
     ik->initialize(THREAD);
   }
@@ -405,9 +405,8 @@
 void RunFinalizationDCmd::execute(DCmdSource source, TRAPS) {
   Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(),
                                                  true, CHECK);
-  instanceKlassHandle klass(THREAD, k);
   JavaValue result(T_VOID);
-  JavaCalls::call_static(&result, klass,
+  JavaCalls::call_static(&result, k,
                          vmSymbols::run_finalization_name(),
                          vmSymbols::void_method_signature(), CHECK);
 }
@@ -423,13 +422,12 @@
   Klass* k = SystemDictionary::resolve_or_fail(
     vmSymbols::finalizer_histogram_klass(), true, CHECK);
 
-  instanceKlassHandle klass(THREAD, k);
   JavaValue result(T_ARRAY);
 
   // We are calling lang.ref.FinalizerHistogram.getFinalizerHistogram() method
   // and expect it to return array of FinalizerHistogramEntry as Object[]
 
-  JavaCalls::call_static(&result, klass,
+  JavaCalls::call_static(&result, k,
                          vmSymbols::get_finalizer_histogram_name(),
                          vmSymbols::void_finalizer_histogram_entry_array_signature(), CHECK);
 
@@ -753,7 +751,6 @@
 
     Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
     Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::jdk_internal_agent_Agent(), loader, Handle(), true, CHECK);
-    instanceKlassHandle ik (THREAD, k);
 
     JavaValue result(T_VOID);
 
@@ -807,7 +804,7 @@
 #undef PUT_OPTION
 
     Handle str = java_lang_String::create_from_str(options.as_string(), CHECK);
-    JavaCalls::call_static(&result, ik, vmSymbols::startRemoteAgent_name(), vmSymbols::string_void_signature(), str, CHECK);
+    JavaCalls::call_static(&result, k, vmSymbols::startRemoteAgent_name(), vmSymbols::string_void_signature(), str, CHECK);
 }
 
 JMXStartLocalDCmd::JMXStartLocalDCmd(outputStream *output, bool heap_allocated) :
@@ -826,10 +823,9 @@
 
     Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
     Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::jdk_internal_agent_Agent(), loader, Handle(), true, CHECK);
-    instanceKlassHandle ik (THREAD, k);
 
     JavaValue result(T_VOID);
-    JavaCalls::call_static(&result, ik, vmSymbols::startLocalAgent_name(), vmSymbols::void_method_signature(), CHECK);
+    JavaCalls::call_static(&result, k, vmSymbols::startLocalAgent_name(), vmSymbols::void_method_signature(), CHECK);
 }
 
 void JMXStopRemoteDCmd::execute(DCmdSource source, TRAPS) {
@@ -843,10 +839,9 @@
 
     Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
     Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::jdk_internal_agent_Agent(), loader, Handle(), true, CHECK);
-    instanceKlassHandle ik (THREAD, k);
 
     JavaValue result(T_VOID);
-    JavaCalls::call_static(&result, ik, vmSymbols::stopRemoteAgent_name(), vmSymbols::void_method_signature(), CHECK);
+    JavaCalls::call_static(&result, k, vmSymbols::stopRemoteAgent_name(), vmSymbols::void_method_signature(), CHECK);
 }
 
 JMXStatusDCmd::JMXStatusDCmd(outputStream *output, bool heap_allocated) :
@@ -864,10 +859,9 @@
 
   Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
   Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::jdk_internal_agent_Agent(), loader, Handle(), true, CHECK);
-  instanceKlassHandle ik (THREAD, k);
 
   JavaValue result(T_OBJECT);
-  JavaCalls::call_static(&result, ik, vmSymbols::getAgentStatus_name(), vmSymbols::void_string_signature(), CHECK);
+  JavaCalls::call_static(&result, k, vmSymbols::getAgentStatus_name(), vmSymbols::void_string_signature(), CHECK);
 
   jvalue* jv = (jvalue*) result.get_value_addr();
   oop str = (oop) jv->l;