diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
index 8c709e1ca13..6556aee6233 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
@@ -20,6 +20,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -171,4 +172,16 @@ public abstract class JavaBaseScope extends JetScopeImpl {
     protected JavaDescriptorResolver getResolver() {
         return semanticServices.getDescriptorResolver();
     }
+
+    //TODO: remove this method
+    @NotNull
+    public PsiElement getPsiElement() {
+        if (declarationProvider instanceof ClassPsiDeclarationProvider) {
+            return ((ClassPsiDeclarationProvider) declarationProvider).getPsiClass();
+        }
+        if (declarationProvider instanceof PackagePsiDeclarationProvider) {
+            return ((PackagePsiDeclarationProvider) declarationProvider).getPsiPackage();
+        }
+        throw new IllegalStateException();
+    }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
index 73a400046e1..5df27d33e71 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
@@ -16,15 +16,12 @@
 
 package org.jetbrains.jet.lang.resolve.java.scope;
 
-import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
 import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
-import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider;
-import org.jetbrains.jet.lang.resolve.java.provider.PackagePsiDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
@@ -36,8 +33,6 @@ public abstract class JavaPackageScope extends JavaBaseScope {
 
     @NotNull
     private final FqName packageFQN;
-    @NotNull
-    private final PsiDeclarationProvider declarationProvider;
 
     protected JavaPackageScope(
             @NotNull NamespaceDescriptor descriptor,
@@ -46,7 +41,6 @@ public abstract class JavaPackageScope extends JavaBaseScope {
             @NotNull JavaSemanticServices semanticServices
     ) {
         super(descriptor, semanticServices, declarationProvider);
-        this.declarationProvider = declarationProvider;
         this.packageFQN = packageFQN;
     }
 
@@ -65,16 +59,4 @@ public abstract class JavaPackageScope extends JavaBaseScope {
     public NamespaceDescriptor getNamespace(@NotNull Name name) {
         return getResolver().resolveNamespace(packageFQN.child(name), DescriptorSearchRule.INCLUDE_KOTLIN);
     }
-
-    //TODO: remove this method
-    @NotNull
-    public PsiElement getPsiElement() {
-        if (declarationProvider instanceof ClassPsiDeclarationProvider) {
-            return ((ClassPsiDeclarationProvider) declarationProvider).getPsiClass();
-        }
-        if (declarationProvider instanceof PackagePsiDeclarationProvider) {
-            return ((PackagePsiDeclarationProvider) declarationProvider).getPsiPackage();
-        }
-        throw new IllegalStateException();
-    }
 }