--- old/src/hotspot/share/ci/ciEnv.cpp	2018-02-15 15:32:27.000000000 -0500
+++ new/src/hotspot/share/ci/ciEnv.cpp	2018-02-15 15:32:27.000000000 -0500
@@ -395,7 +395,7 @@
 
   // Now we need to check the SystemDictionary
   Symbol* sym = name->get_symbol();
-  if ((sym->byte_at(0) == 'L' || sym->byte_at(0) == 'Q') &&
+  if (sym->byte_at(0) == 'L' &&
     sym->byte_at(sym->utf8_length()-1) == ';') {
     // This is a name from a signature.  Strip off the trimmings.
     // Call recursive to keep scope of strippedsym.
@@ -450,7 +450,7 @@
   // to be loaded if their element klasses are loaded, except when memory
   // is exhausted.
   if (sym->byte_at(0) == '[' &&
-      (sym->byte_at(1) == '[' || sym->byte_at(1) == 'L' || sym->byte_at(1) == 'Q')) {
+      (sym->byte_at(1) == '[' || sym->byte_at(1) == 'L')) {
     // We have an unloaded array.
     // Build it on the fly if the element class exists.
     TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1,