diff --git a/compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java
index 830dbd53437..22410e145e5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java
@@ -80,7 +80,7 @@ public interface JetNodeTypes {
     IElementType TYPE_CONSTRAINT_LIST    = JetStubElementTypes.TYPE_CONSTRAINT_LIST;
     IElementType TYPE_CONSTRAINT         = JetStubElementTypes.TYPE_CONSTRAINT;
 
-    IElementType CONSTRUCTOR_DELEGATION_CALL = JetStubElementTypes.CONSTRUCTOR_DELEGATION_CALL;
+    IElementType CONSTRUCTOR_DELEGATION_CALL = new JetNodeType("CONSTRUCTOR_DELEGATION_CALL", JetConstructorDelegationCall.class);
     JetNodeType CONSTRUCTOR_DELEGATION_REFERENCE =
             new JetNodeType("CONSTRUCTOR_DELEGATION_REFERENCE", JetConstructorDelegationReferenceExpression.class);
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructorDelegationCall.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructorDelegationCall.java
index dc4d1873e1d..6c7e8e19147 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructorDelegationCall.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructorDelegationCall.java
@@ -17,23 +17,14 @@
 package org.jetbrains.kotlin.psi;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.stubs.IStubElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.JetNodeTypes;
-import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub;
-import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
 
 import java.util.Collections;
 import java.util.List;
 
-public class JetConstructorDelegationCall extends JetElementImplStub<KotlinPlaceHolderStub<? extends JetConstructorDelegationCall>> implements JetCallElement {
-    public JetConstructorDelegationCall(
-            @NotNull KotlinPlaceHolderStub<? extends JetConstructorDelegationCall> stub
-    ) {
-        super(stub, JetStubElementTypes.CONSTRUCTOR_DELEGATION_CALL);
-    }
-
+public class JetConstructorDelegationCall extends JetElementImpl implements JetCallElement {
     public JetConstructorDelegationCall(@NotNull ASTNode node) {
         super(node);
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.java
index bf0a8f4b140..df720c4ddff 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.java
@@ -174,7 +174,7 @@ public class JetSecondaryConstructor extends JetDeclarationStub<KotlinPlaceHolde
 
     @Nullable
     public JetConstructorDelegationCall getDelegationCall() {
-        return getStubOrPsiChild(JetStubElementTypes.CONSTRUCTOR_DELEGATION_CALL);
+        return findChildByClass(JetConstructorDelegationCall.class);
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java
index f91f43f3082..dcaa78d6ddc 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java
@@ -109,8 +109,6 @@ public interface JetStubElementTypes {
             new JetPlaceHolderStubElementType<JetDelegatorToSuperCall>("DELEGATOR_SUPER_CALL", JetDelegatorToSuperCall.class);
     JetPlaceHolderStubElementType<JetDelegatorToSuperClass> DELEGATOR_SUPER_CLASS =
             new JetPlaceHolderStubElementType<JetDelegatorToSuperClass>("DELEGATOR_SUPER_CLASS", JetDelegatorToSuperClass.class);
-    JetPlaceHolderStubElementType<JetConstructorDelegationCall> CONSTRUCTOR_DELEGATION_CALL =
-            new JetPlaceHolderStubElementType<JetConstructorDelegationCall>("CONSTRUCTOR_DELEGATION_CALL", JetConstructorDelegationCall.class);
     JetPlaceHolderStubElementType<JetConstructorCalleeExpression> CONSTRUCTOR_CALLEE =
             new JetPlaceHolderStubElementType<JetConstructorCalleeExpression>("CONSTRUCTOR_CALLEE", JetConstructorCalleeExpression.class);