diff --git a/source/com/intellij/find/findUsages/FindUsagesManager.java b/source/com/intellij/find/findUsages/FindUsagesManager.java
index 7259041e9586..6f2d8c4a5b4e 100644
--- a/source/com/intellij/find/findUsages/FindUsagesManager.java
+++ b/source/com/intellij/find/findUsages/FindUsagesManager.java
@@ -31,7 +31,6 @@ import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.VariableKind;
 import com.intellij.psi.impl.search.ThrowSearchUtil;
 import com.intellij.psi.search.*;
-import com.intellij.psi.util.MethodSignatureUtil;
 import com.intellij.psi.util.PropertyUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.xml.XmlAttributeDecl;
@@ -386,11 +385,6 @@ public class FindUsagesManager {
         }
       }
     }
-    else if (psiElement instanceof PsiMethod) {
-      if (scopeFile == null && findUsagesOptions.isIncludeOverloadUsages) {
-        elementsToSearch = MethodSignatureUtil.getOverloads((PsiMethod)psiElement);
-      }
-    }
 
     if (elementsToSearch == null) {
       elementsToSearch = new PsiElement[] {psiElement};
diff --git a/source/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/source/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
index 81375284d435..cc009e6ac7e4 100644
--- a/source/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+++ b/source/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
@@ -803,7 +803,6 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
     if (isStrictSignatureSearch && (parentClass == null
                                     || parentClass instanceof PsiAnonymousClass
                                     || parentClass.hasModifierProperty(PsiModifier.FINAL)
-                                    || method instanceof PsiAnnotationMethod
                                     || method.hasModifierProperty(PsiModifier.STATIC)
                                     || method.hasModifierProperty(PsiModifier.FINAL)
                                     || method.hasModifierProperty(PsiModifier.PRIVATE))
diff --git a/source/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java b/source/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java
index c864c4553adf..6fe11a8fbb4b 100644
--- a/source/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java
+++ b/source/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java
@@ -1,9 +1,6 @@
 package com.intellij.psi.impl.source;
 
-import com.intellij.psi.PsiAnnotationMethod;
-import com.intellij.psi.PsiExpression;
-import com.intellij.psi.PsiAnnotationMemberValue;
-import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiManagerImpl;
 import com.intellij.psi.impl.source.tree.RepositoryTreeElement;
 import com.intellij.psi.impl.source.tree.ChildRole;
@@ -20,6 +17,11 @@ public class PsiAnnotationMethodImpl extends PsiMethodImpl implements PsiAnnotat
     super(manager, treeElement);
   }
 
+  public boolean hasModifierProperty(String name) {
+    if (PsiModifier.FINAL.equals(name)) return true;
+    return super.hasModifierProperty(name);
+  }
+
   public PsiAnnotationMemberValue getDefaultValue() {
     return (PsiAnnotationMemberValue)calcTreeElement().findChildByRole(ChildRole.ANNOTATION_DEFAULT_VALUE);
   }