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 d42b71b9bbe..dd839f6df45 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
@@ -279,7 +279,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
         callExpressionResolver.setExpressionTypingServices(expressionTypingServices);
 
         typeResolver.setAnnotationResolver(annotationResolver);
-        typeResolver.setDescriptorResolver(descriptorResolver);
         typeResolver.setModuleDescriptor(moduleDescriptor);
         typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
 
diff --git a/compiler/frontend/idea.properties b/compiler/frontend/idea.properties
new file mode 100644
index 00000000000..943751e57c9
--- /dev/null
+++ b/compiler/frontend/idea.properties
@@ -0,0 +1 @@
+idea.home=../../idea/src
\ No newline at end of file
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
index 80cb7cdb855..dd55aa0d82c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
@@ -132,7 +132,6 @@ public class InjectorForBodyResolve {
         descriptorResolver.setTypeResolver(typeResolver);
 
         typeResolver.setAnnotationResolver(annotationResolver);
-        typeResolver.setDescriptorResolver(descriptorResolver);
         typeResolver.setModuleDescriptor(moduleDescriptor);
         typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
index dc6a5be22ff..a2a7b5dc4bd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
@@ -90,7 +90,6 @@ public class InjectorForLazyResolve {
         this.expressionTypingServices.setTypeResolver(typeResolver);
 
         this.typeResolver.setAnnotationResolver(annotationResolver);
-        this.typeResolver.setDescriptorResolver(descriptorResolver);
         this.typeResolver.setModuleDescriptor(moduleDescriptor);
         this.typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
index 0945a248d63..467bb4cadf8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
@@ -25,10 +25,10 @@ import org.jetbrains.jet.lang.resolve.AnnotationResolver;
 import org.jetbrains.jet.lang.resolve.calls.CallResolver;
 import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
 import org.jetbrains.jet.lang.resolve.TypeResolver;
-import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
 import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
 import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver;
+import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
@@ -44,10 +44,10 @@ public class InjectorForMacros {
     private final CallResolver callResolver;
     private final ArgumentTypeResolver argumentTypeResolver;
     private final TypeResolver typeResolver;
-    private final DescriptorResolver descriptorResolver;
     private final QualifiedExpressionResolver qualifiedExpressionResolver;
     private final CandidateResolver candidateResolver;
     private final CallExpressionResolver callExpressionResolver;
+    private final DescriptorResolver descriptorResolver;
     
     public InjectorForMacros(
         @NotNull Project project,
@@ -62,10 +62,10 @@ public class InjectorForMacros {
         this.callResolver = new CallResolver();
         this.argumentTypeResolver = new ArgumentTypeResolver();
         this.typeResolver = new TypeResolver();
-        this.descriptorResolver = new DescriptorResolver();
         this.qualifiedExpressionResolver = new QualifiedExpressionResolver();
         this.candidateResolver = new CandidateResolver();
         this.callExpressionResolver = new CallExpressionResolver();
+        this.descriptorResolver = new DescriptorResolver();
 
         this.expressionTypingServices.setAnnotationResolver(annotationResolver);
         this.expressionTypingServices.setCallExpressionResolver(callExpressionResolver);
@@ -88,18 +88,17 @@ public class InjectorForMacros {
         argumentTypeResolver.setTypeResolver(typeResolver);
 
         typeResolver.setAnnotationResolver(annotationResolver);
-        typeResolver.setDescriptorResolver(descriptorResolver);
         typeResolver.setModuleDescriptor(moduleDescriptor);
         typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
 
-        descriptorResolver.setAnnotationResolver(annotationResolver);
-        descriptorResolver.setExpressionTypingServices(expressionTypingServices);
-        descriptorResolver.setTypeResolver(typeResolver);
-
         candidateResolver.setArgumentTypeResolver(argumentTypeResolver);
 
         callExpressionResolver.setExpressionTypingServices(expressionTypingServices);
 
+        descriptorResolver.setAnnotationResolver(annotationResolver);
+        descriptorResolver.setExpressionTypingServices(expressionTypingServices);
+        descriptorResolver.setTypeResolver(typeResolver);
+
     }
     
     @PreDestroy
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
index 6fb3b8a5316..f14a2e37a89 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
@@ -187,7 +187,6 @@ public class InjectorForTopDownAnalyzerBasic {
         callExpressionResolver.setExpressionTypingServices(expressionTypingServices);
 
         typeResolver.setAnnotationResolver(annotationResolver);
-        typeResolver.setDescriptorResolver(descriptorResolver);
         typeResolver.setModuleDescriptor(moduleDescriptor);
         typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
index bee16bd8f0f..47f81f3f6c6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
@@ -40,15 +40,9 @@ import static org.jetbrains.jet.lang.types.Variance.*;
 public class TypeResolver {
 
     private AnnotationResolver annotationResolver;
-    private DescriptorResolver descriptorResolver;
     private QualifiedExpressionResolver qualifiedExpressionResolver;
     private ModuleDescriptor moduleDescriptor;
 
-    @Inject
-    public void setDescriptorResolver(DescriptorResolver descriptorResolver) {
-        this.descriptorResolver = descriptorResolver;
-    }
-
     @Inject
     public void setAnnotationResolver(AnnotationResolver annotationResolver) {
         this.annotationResolver = annotationResolver;
@@ -66,7 +60,7 @@ public class TypeResolver {
 
     @NotNull
     public JetType resolveType(@NotNull JetScope scope, @NotNull JetTypeReference typeReference, BindingTrace trace, boolean checkBounds) {
-        return resolveType(new TypeResolutionContext(scope, trace, checkBounds, false), typeReference);
+        return resolveType(new TypeResolutionContext(scope, trace, checkBounds), typeReference);
     }
 
     @NotNull
diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
index 63c65515102..6bfe138e84e 100644
--- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
+++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
@@ -83,7 +83,6 @@ public class InjectorForTests {
         this.expressionTypingServices.setTypeResolver(typeResolver);
 
         this.typeResolver.setAnnotationResolver(annotationResolver);
-        this.typeResolver.setDescriptorResolver(descriptorResolver);
         this.typeResolver.setModuleDescriptor(moduleDescriptor);
         this.typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
 
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 6925535e58a..5b9ca750657 100644
--- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
@@ -186,7 +186,6 @@ public class InjectorForTopDownAnalyzerForJs {
         callExpressionResolver.setExpressionTypingServices(expressionTypingServices);
 
         typeResolver.setAnnotationResolver(annotationResolver);
-        typeResolver.setDescriptorResolver(descriptorResolver);
         typeResolver.setModuleDescriptor(moduleDescriptor);
         typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);