diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
index 4f978fb0cc7..8a7f19e3ccd 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
@@ -275,7 +275,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
 
         scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver);
         scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
-        scriptHeaderResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
         scriptHeaderResolver.setTrace(bindingTrace);
 
         overloadResolver.setTrace(bindingTrace);
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
index f7d069d47cc..ac5909805dd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
@@ -230,7 +230,6 @@ public class InjectorForTopDownAnalyzerBasic {
 
         scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);
         scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
-        scriptHeaderResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
         scriptHeaderResolver.setTrace(bindingTrace);
 
         overloadResolver.setTrace(bindingTrace);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java
index 120582c2c59..7b61cabec2e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java
@@ -56,8 +56,6 @@ public class ScriptHeaderResolver {
     private DependencyClassByQualifiedNameResolver dependencyClassByQualifiedNameResolver;
     @NotNull
     private BindingTrace trace;
-    @NotNull
-    private TopDownAnalysisParameters topDownAnalysisParameters;
 
     @Inject
     public void setPackageFragmentProvider(@NotNull MutablePackageFragmentProvider packageFragmentProvider) {
@@ -74,11 +72,6 @@ public class ScriptHeaderResolver {
         this.trace = trace;
     }
 
-    @Inject
-    public void setTopDownAnalysisParameters(@NotNull TopDownAnalysisParameters topDownAnalysisParameters) {
-        this.topDownAnalysisParameters = topDownAnalysisParameters;
-    }
-
 
     @NotNull
     private ClassDescriptor resolveClass(@NotNull FqName className) {
@@ -152,7 +145,7 @@ public class ScriptHeaderResolver {
             int index = 0;
             List<AnalyzerScriptParameter> scriptParameters = !scriptDefinition.getScriptParameters().isEmpty()
                                                        ? scriptDefinition.getScriptParameters()
-                                                       : topDownAnalysisParameters.getScriptParameters();
+                                                       : c.getTopDownAnalysisParameters().getScriptParameters();
 
             for (AnalyzerScriptParameter scriptParameter : scriptParameters) {
                 ValueParameterDescriptor parameter = resolveScriptParameter(scriptParameter, index, descriptor);
diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
index 3324ba83e0f..0ea5e494aeb 100644
--- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
@@ -230,7 +230,6 @@ public class InjectorForTopDownAnalyzerForJs {
 
         scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);
         scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
-        scriptHeaderResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
         scriptHeaderResolver.setTrace(bindingTrace);
 
         overloadResolver.setTrace(bindingTrace);