diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java
index 4fed53fbd002..dc83c8ba72a2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java
@@ -36,7 +36,7 @@ public class JavaClassSupersImpl extends JavaClassSupers {
                                                  @NotNull PsiClass derivedClass,
                                                  @NotNull GlobalSearchScope scope,
                                                  @NotNull PsiSubstitutor derivedSubstitutor) {
-    if (isJavaLangObject(superClass)) return PsiSubstitutor.EMPTY;
+    if (InheritanceImplUtil.hasObjectQualifiedName(superClass)) return PsiSubstitutor.EMPTY;
 
     return derivedClass instanceof PsiTypeParameter
            ? processTypeParameter((PsiTypeParameter)derivedClass, scope, superClass, ContainerUtil.<PsiTypeParameter>newTroveSet(), derivedSubstitutor)
@@ -55,10 +55,6 @@ public class JavaClassSupersImpl extends JavaClassSupers {
     return composeSubstitutors(derivedSubstitutor, substitutor);
   }
 
-  static boolean isJavaLangObject(PsiClass psiClass) {
-    return CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName());
-  }
-
   @NotNull
   static PsiSubstitutor createRawSubstitutor(@NotNull PsiClass superClass) {
     return JavaPsiFacade.getElementFactory(superClass.getProject()).createRawSubstitutor(superClass);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/ScopedClassHierarchy.java b/java/java-psi-impl/src/com/intellij/psi/impl/ScopedClassHierarchy.java
index 0145def28601..54a3ceddbd5c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/ScopedClassHierarchy.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/ScopedClassHierarchy.java
@@ -59,7 +59,7 @@ class ScopedClassHierarchy {
 
       PsiClassType.ClassResolveResult resolveResult = ((PsiClassType)type).resolveGenerics();
       PsiClass psiClass = resolveResult.getElement();
-      if (psiClass == null || JavaClassSupersImpl.isJavaLangObject(psiClass) || mySupersWithSubstitutors.containsKey(psiClass)) continue;
+      if (psiClass == null || InheritanceImplUtil.hasObjectQualifiedName(psiClass) || mySupersWithSubstitutors.containsKey(psiClass)) continue;
   
       mySupersWithSubstitutors.put(psiClass, resolveResult);