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 426e3781210..5ce29a88508 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
@@ -263,7 +263,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
 
         functionAnalyzerExtension.setTrace(bindingTrace);
 
-        scriptBodyResolver.setContext(topDownAnalysisContext);
         scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
         scriptBodyResolver.setTrace(bindingTrace);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
index af4da7dc1b0..db58e514e1d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
@@ -44,7 +44,6 @@ import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer;
 import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
 import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension;
 import org.jetbrains.jet.lang.resolve.ScriptBodyResolver;
-import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
@@ -80,7 +79,6 @@ public class InjectorForBodyResolve {
     private final DeclarationsChecker declarationsChecker;
     private final FunctionAnalyzerExtension functionAnalyzerExtension;
     private final ScriptBodyResolver scriptBodyResolver;
-    private final TopDownAnalysisContext topDownAnalysisContext;
     
     public InjectorForBodyResolve(
         @NotNull Project project,
@@ -116,7 +114,6 @@ public class InjectorForBodyResolve {
         this.declarationsChecker = new DeclarationsChecker();
         this.functionAnalyzerExtension = new FunctionAnalyzerExtension();
         this.scriptBodyResolver = new ScriptBodyResolver();
-        this.topDownAnalysisContext = new TopDownAnalysisContext(topDownAnalysisParameters);
 
         this.bodyResolver.setAnnotationResolver(annotationResolver);
         this.bodyResolver.setCallResolver(callResolver);
@@ -184,7 +181,6 @@ public class InjectorForBodyResolve {
 
         functionAnalyzerExtension.setTrace(bindingTrace);
 
-        scriptBodyResolver.setContext(topDownAnalysisContext);
         scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
         scriptBodyResolver.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 d1d685d0611..220dc9b7d6b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
@@ -218,7 +218,6 @@ public class InjectorForTopDownAnalyzerBasic {
 
         functionAnalyzerExtension.setTrace(bindingTrace);
 
-        scriptBodyResolver.setContext(topDownAnalysisContext);
         scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
         scriptBodyResolver.setTrace(bindingTrace);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
index b34027fff91..e06edad87c4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
@@ -134,7 +134,7 @@ public class BodyResolver {
 
         resolveFunctionBodies(c);
 
-        scriptBodyResolverResolver.resolveScriptBodies();
+        scriptBodyResolverResolver.resolveScriptBodies(c);
 
         if (!topDownAnalysisParameters.isDeclaredLocally()) {
             computeDeferredTypes();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java
index ccdce292546..9e9f87dbfee 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java
@@ -42,16 +42,12 @@ import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE;
 
 public class ScriptBodyResolver {
 
-    @NotNull
-    private TopDownAnalysisContext context;
     @NotNull
     private ExpressionTypingServices expressionTypingServices;
     @NotNull
     private BindingTrace trace;
 
-    @Inject
     public void setContext(@NotNull TopDownAnalysisContext context) {
-        this.context = context;
     }
 
     @Inject
@@ -66,11 +62,11 @@ public class ScriptBodyResolver {
 
 
 
-    public void resolveScriptBodies() {
-        for (Map.Entry<JetScript, ScriptDescriptor> e : context.getScripts().entrySet()) {
+    public void resolveScriptBodies(@NotNull BodiesResolveContext c) {
+        for (Map.Entry<JetScript, ScriptDescriptor> e : c.getScripts().entrySet()) {
             JetScript declaration = e.getKey();
             ScriptDescriptor descriptor = e.getValue();
-            WritableScope scope = context.getScriptScopes().get(declaration);
+            WritableScope scope = c.getScriptScopes().get(declaration);
 
             // TODO: lock in resolveScriptDeclarations
             scope.changeLockLevel(WritableScope.LockLevel.READING);
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 fd0101f34e5..58683153c4a 100644
--- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
@@ -218,7 +218,6 @@ public class InjectorForTopDownAnalyzerForJs {
 
         functionAnalyzerExtension.setTrace(bindingTrace);
 
-        scriptBodyResolver.setContext(topDownAnalysisContext);
         scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
         scriptBodyResolver.setTrace(bindingTrace);