--- a/src/hotspot/share/oops/klass.cpp	Sat Jan 05 20:08:24 2019 +0100
+++ b/src/hotspot/share/oops/klass.cpp	Sat Jan 05 20:11:15 2019 +0100
@@ -231,11 +231,6 @@
 }
 
 void Klass::initialize_supers(Klass* k, Array<InstanceKlass*>* transitive_interfaces, TRAPS) {
-  if (FastSuperclassLimit == 0) {
-    // None of the other machinery matters.
-    set_super(k);
-    return;
-  }
   if (k == NULL) {
     set_super(NULL);
     _primary_supers[0] = this;

--- a/src/hotspot/share/oops/klass.hpp	Sat Jan 05 20:08:24 2019 +0100
+++ b/src/hotspot/share/oops/klass.hpp	Sat Jan 05 20:11:15 2019 +0100
@@ -429,14 +429,7 @@
   static jint array_layout_helper(BasicType etype);
 
   // What is the maximum number of primary superclasses any klass can have?
-#ifdef PRODUCT
   static juint primary_super_limit()         { return _primary_super_limit; }
-#else
-  static juint primary_super_limit() {
-    assert(FastSuperclassLimit <= _primary_super_limit, "parameter oob");
-    return FastSuperclassLimit;
-  }
-#endif
 
   // vtables
   klassVtable vtable() const;

--- a/src/hotspot/share/runtime/globals.hpp	Sat Jan 05 20:08:24 2019 +0100
+++ b/src/hotspot/share/runtime/globals.hpp	Sat Jan 05 20:11:15 2019 +0100
@@ -2317,11 +2317,6 @@
           "Don't compile methods larger than this if "                      \
           "+DontCompileHugeMethods")                                        \
                                                                             \
-  /* New JDK 1.4 reflection implementation */                               \
-                                                                            \
-  develop(intx, FastSuperclassLimit, 8,                                     \
-          "Depth of hardwired instanceof accelerator array")                \
-                                                                            \
   /* Properties for Java libraries  */                                      \
                                                                             \
   product(uint64_t, MaxDirectMemorySize, 0,                                 \