Revert "Bug 526040: Merge Java 9 related changes from JDT - temp fix for https://bugs.eclipse.org/520874#c11"

This reverts commit 2f7a2645ecd7c74b379319696bbc80358bb10930.
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
index a2ea19e..b21c157 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
@@ -2335,12 +2335,7 @@
 		if (superType.isMemberType()) {
 			ReferenceBinding current = superType.enclosingType();
 			do {
-//{ObjectTeams:  problematic fix for bug 520874:
-/* orig: 
 				if (current.isHierarchyBeingActivelyConnected()) {
-  :giro */
-				if (current.isHierarchyBeingActivelyConnected() && ((TypeBinding.equalsEquals(current, superType) || !current.isStatic()))) {
-// SH}
 					problemReporter().hierarchyCircularity(sourceType, current, reference);
 					sourceType.tagBits |= TagBits.HierarchyHasProblems;
 					current.tagBits |= TagBits.HierarchyHasProblems;