diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubClassMemberDeclarationProvider.java b/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubClassMemberDeclarationProvider.java
deleted file mode 100644
index 32ad3df6797..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubClassMemberDeclarationProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.stubindex.resolve;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetNamedFunction;
-import org.jetbrains.jet.lang.psi.JetProperty;
-import org.jetbrains.jet.lang.resolve.lazy.ClassMemberDeclarationProvider;
-import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
-import org.jetbrains.jet.lang.resolve.name.Name;
-
-import java.util.Collection;
-
-public class StubClassMemberDeclarationProvider extends AbstractStubDeclarationProvider implements ClassMemberDeclarationProvider {
-    @NotNull
-    @Override
-    public JetClassLikeInfo getOwnerInfo() {
-        // TODO:
-        return null;
-    }
-
-    @NotNull
-    @Override
-    public Collection<JetNamedFunction> getFunctionDeclarations(@NotNull Name name) {
-        // TODO:
-        return null;
-    }
-
-    @NotNull
-    @Override
-    public Collection<JetProperty> getPropertyDeclarations(@NotNull Name name) {
-        // TODO:
-        return null;
-    }
-}
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubDeclarationProviderFactory.java b/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubDeclarationProviderFactory.java
index d779c12a5e1..dbfce11c2af 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubDeclarationProviderFactory.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubDeclarationProviderFactory.java
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.lazy.ClassMemberDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.lazy.DeclarationProviderFactory;
 import org.jetbrains.jet.lang.resolve.lazy.PackageMemberDeclarationProvider;
+import org.jetbrains.jet.lang.resolve.lazy.PsiBasedClassMemberDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 
@@ -38,8 +39,7 @@ public class StubDeclarationProviderFactory implements DeclarationProviderFactor
     @NotNull
     @Override
     public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull JetClassLikeInfo classLikeInfo) {
-        // TODO:
-        return null;
+        return new PsiBasedClassMemberDeclarationProvider(classLikeInfo);
     }
 
     @Override