diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java
index 78fd34c9087..982cf7125c1 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java
@@ -79,16 +79,6 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor {
     @Nullable
     @Override
     public JetType getClassObjectType() {
-        if (getKind() == ClassKind.OBJECT) {
-            return getDefaultType();
-        }
-
-        if (getKind() == ClassKind.ENUM_ENTRY) {
-            DeclarationDescriptor enumClass = getContainingDeclaration();
-            assert isEnumClass(enumClass) : "Enum entry should be declared in enum class: " + this;
-            return ((ClassDescriptor) enumClass).getDefaultType();
-        }
-
         ClassDescriptor classObject = getClassObjectDescriptor();
         return classObject == null ? null : classObject.getDefaultType();
     }