diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
index 0cb06a123166..3a4b5639cfd4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
@@ -235,6 +235,8 @@ public class JavaCompletionContributor extends CompletionContributor {
       }
     }
 
+    JavaOverrideCompletionContributor.fillCompletionVariants(parameters, result);
+
     addAllClasses(parameters, result, inheritors);
 
     final PsiElement parent = position.getParent();
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaOverrideCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaOverrideCompletionContributor.java
index d71de30567c2..6b87f166ea97 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaOverrideCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaOverrideCompletionContributor.java
@@ -38,11 +38,10 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
 /**
  * @author peter
  */
-public class JavaOverrideCompletionContributor extends CompletionContributor {
+public class JavaOverrideCompletionContributor {
   static final Key<Boolean> OVERRIDE_ELEMENT = Key.create("OVERRIDE_ELEMENT");
 
-  @Override
-  public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet _result) {
+  public static void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
     if (parameters.getCompletionType() != CompletionType.BASIC && parameters.getCompletionType() != CompletionType.SMART) {
       return;
     }
@@ -53,7 +52,6 @@ public class JavaOverrideCompletionContributor extends CompletionContributor {
       andNot(psiElement().afterLeaf(psiElement().inside(PsiModifierList.class))).accepts(position)) {
       final PsiClass parent = CompletionUtil.getOriginalElement((PsiClass)position.getParent().getParent().getParent());
       if (parent != null) {
-        CompletionResultSet result = JavaCompletionSorting.addJavaSorting(parameters, _result);
         addSuperSignatureElements(parent, true, result);
         addSuperSignatureElements(parent, false, result);
       }
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index b862a92ee514..1505d7c503d8 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -301,8 +301,6 @@
                             order="before javaLegacy, before default"/>
     <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaMemberNameCompletionContributor" id="javaMemberName"
                             order="before javaOverride"/>
-    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaOverrideCompletionContributor" id="javaOverride"
-                            order="before javaLegacy"/>
     <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaClassNameCompletionContributor" id="javaClassName"
                             order="last, before default"/>