diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
index 2c85d4c7076..4e211c8d368 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
@@ -153,12 +153,6 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
         return result;
     }
 
-    @NotNull
-    @Override
-    public DeclarationDescriptor getOriginal() {
-        return this;
-    }
-
     @NotNull
     @Override
     public DeclarationDescriptor getContainingDeclaration() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
index d296e4e42a0..e7f116a34d8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
@@ -250,12 +250,6 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
         return unsubstitutedMemberScope.getPrimaryConstructor();
     }
 
-    @NotNull
-    @Override
-    public DeclarationDescriptor getOriginal() {
-        return this;
-    }
-
     @NotNull
     @Override
     public DeclarationDescriptor getContainingDeclaration() {
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java
index b6daa06956e..e9b34877e4c 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java
@@ -18,6 +18,7 @@ package org.jetbrains.jet.lang.descriptors.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -31,6 +32,12 @@ public abstract class ClassDescriptorBase implements ClassDescriptor {
 
     protected volatile JetType defaultType;
 
+    @NotNull
+    @Override
+    public DeclarationDescriptor getOriginal() {
+        return this;
+    }
+
     protected abstract JetScope getScopeForMemberLookup();
 
     @NotNull
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java
index 3305c12e047..18f64705628 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java
@@ -89,12 +89,6 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase {
         this.name = name;
     }
 
-    @NotNull
-    @Override
-    public DeclarationDescriptor getOriginal() {
-        return this;
-    }
-
     @NotNull
     @Override
     public TypeConstructor getTypeConstructor() {