diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java
index 0a21422e68b..a870eb998be 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java
@@ -24,33 +24,29 @@ import org.jetbrains.jet.lang.resolve.java.PsiClassFinder;
 import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN;
 
 public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclarationProviderImpl implements PackagePsiDeclarationProvider {
-
     @NotNull
-    private final PackagePsiDeclarationProvider packagePsiDeclarationProvider;
+    private final PsiPackage psiPackage;
 
     public KotlinNamespacePsiDeclarationProvider(
             @NotNull PsiPackage psiPackage,
             @NotNull PsiClass psiClass,
-            @NotNull PsiDeclarationProviderFactory factory,
             @NotNull PsiClassFinder psiClassFinder
     ) {
         super(psiClass, true, psiClassFinder);
-
-        // TODO: remove?
-        this.packagePsiDeclarationProvider = factory.createDeclarationProviderForNamespaceWithoutMembers(psiPackage);
+        this.psiPackage = psiPackage;
     }
 
     @NotNull
     @Override
     public PsiPackage getPsiPackage() {
-        return packagePsiDeclarationProvider.getPsiPackage();
+        return psiPackage;
     }
 
     @NotNull
     @Override
     protected MembersCache buildMembersCache() {
         MembersCache cacheWithMembers = super.buildMembersCache();
-        MembersCache.buildMembersByNameCache(cacheWithMembers, psiClassFinder, null, packagePsiDeclarationProvider.getPsiPackage(), true, getDeclarationOrigin() == KOTLIN);
+        MembersCache.buildMembersByNameCache(cacheWithMembers, psiClassFinder, null, psiPackage, true, getDeclarationOrigin() == KOTLIN);
         return cacheWithMembers;
     }
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
index 5cd9ccef42a..e72564a6835 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
@@ -41,7 +41,7 @@ public final class PsiDeclarationProviderFactory {
     @NotNull
     public KotlinNamespacePsiDeclarationProvider createDeclarationForKotlinNamespace(
             @NotNull PsiPackage psiPackage, @NotNull PsiClass psiClass) {
-        return new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass, this, psiClassFinder);
+        return new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass, psiClassFinder);
     }
 
     @NotNull