diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
index eafd67c8dbd..281b4c0ed2f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
@@ -145,7 +145,7 @@ public class AnnotationResolver {
                 );
             }
             if (shouldResolveArguments) {
-                resolveAnnotationArguments(entryElement, scope, trace);
+                resolveAnnotationArguments(entryElement, trace);
             }
 
             result.add(descriptor);
@@ -199,27 +199,26 @@ public class AnnotationResolver {
         );
     }
 
-    public void resolveAnnotationsArguments(@NotNull JetScope scope, @Nullable JetModifierList modifierList, @NotNull BindingTrace trace) {
+    public void resolveAnnotationsArguments(@Nullable JetModifierList modifierList, @NotNull BindingTrace trace) {
         if (modifierList == null) {
             return;
         }
 
         for (JetAnnotationEntry annotationEntry : modifierList.getAnnotationEntries()) {
-            resolveAnnotationArguments(annotationEntry, scope, trace);
+            resolveAnnotationArguments(annotationEntry, trace);
         }
     }
 
-    public void resolveAnnotationsArguments(@NotNull Annotated descriptor, @NotNull BindingTrace trace, @NotNull JetScope scope) {
+    public void resolveAnnotationsArguments(@NotNull Annotated descriptor, @NotNull BindingTrace trace) {
         for (AnnotationDescriptor annotationDescriptor : descriptor.getAnnotations()) {
             JetAnnotationEntry annotationEntry = trace.getBindingContext().get(ANNOTATION_DESCRIPTOR_TO_PSI_ELEMENT, annotationDescriptor);
             assert annotationEntry != null : "Cannot find annotation entry: " + annotationDescriptor;
-            resolveAnnotationArguments(annotationEntry, scope, trace);
+            resolveAnnotationArguments(annotationEntry, trace);
         }
     }
 
     private static void resolveAnnotationArguments(
             @NotNull JetAnnotationEntry annotationEntry,
-            @NotNull JetScope scope,
             @NotNull BindingTrace trace
     ) {
         AnnotationDescriptor annotationDescriptor = trace.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry);
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 b3e149a7556..b48cfee6b37 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
@@ -36,7 +36,6 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
 import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.expressions.DataFlowUtils;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
-import org.jetbrains.jet.lexer.JetKeywordToken;
 import org.jetbrains.jet.lexer.JetModifierKeywordToken;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.util.Box;
@@ -384,7 +383,7 @@ public class BodyResolver {
             ClassDescriptorWithResolutionScopes classDescriptor = entry.getValue();
             ConstructorDescriptor unsubstitutedPrimaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
 
-            annotationResolver.resolveAnnotationsArguments(classDescriptor.getScopeForClassHeaderResolution(), klass.getPrimaryConstructorModifierList(), trace);
+            annotationResolver.resolveAnnotationsArguments(klass.getPrimaryConstructorModifierList(), trace);
 
             if (unsubstitutedPrimaryConstructor != null) {
                 WritableScope parameterScope = getPrimaryConstructorParametersScope(classDescriptor.getScopeForClassHeaderResolution(), unsubstitutedPrimaryConstructor);
@@ -645,7 +644,7 @@ public class BodyResolver {
     }
 
     private void resolveAnnotationArguments(@NotNull JetScope scope, @NotNull JetModifierListOwner owner) {
-        annotationResolver.resolveAnnotationsArguments(scope, owner.getModifierList(), trace);
+        annotationResolver.resolveAnnotationsArguments(owner.getModifierList(), trace);
     }
 
     private static void computeDeferredType(JetType type) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
index 7a014f7d810..94692a0b1a0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
@@ -185,7 +185,7 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
                            // thus doesn't have a surrounding data flow
                            DataFlowInfo.EMPTY);
             result.add(propertyDescriptor);
-            resolveSession.getAnnotationResolver().resolveAnnotationsArguments(propertyDescriptor, trace, resolutionScope);
+            resolveSession.getAnnotationResolver().resolveAnnotationsArguments(propertyDescriptor, trace);
         }
 
         getNonDeclaredProperties(name, result);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
index 79a6bc3be73..fc22fe4a679 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
@@ -378,7 +378,7 @@ public class ExpressionTypingServices {
             ValueParameterDescriptor valueParameterDescriptor = valueParameterDescriptors.get(i);
             JetParameter jetParameter = valueParameters.get(i);
 
-            annotationResolver.resolveAnnotationsArguments(declaringScope, jetParameter.getModifierList(), trace);
+            annotationResolver.resolveAnnotationsArguments(jetParameter.getModifierList(), trace);
 
             if (!needCompleteAnalysis) continue;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
index a0f39a2807d..4db887b5c69 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
@@ -213,8 +213,7 @@ public class ResolveElementCache {
 
             resolveSession.getAnnotationResolver().resolveAnnotationsArguments(
                     descriptor,
-                    resolveSession.getTrace(),
-                    resolveSession.getScopeProvider().getResolutionScopeForDeclaration(declaration)
+                    resolveSession.getTrace()
             );
 
             ForceResolveUtil.forceResolveAllContents(descriptor.getAnnotations());