diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 1ba0c8306d36..b757b3a014ce 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -956,31 +956,13 @@ public final class HighlightUtil {
       String message = JavaErrorBundle.message("incompatible.modifiers", modifier, incompatible);
       HighlightInfo highlightInfo =
         HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(keyword).descriptionAndTooltip(message).create();
-      String modifierToRemove = getModifierToRemove(modifierList, modifier, incompatible);
-      IntentionAction fix =
-        modifierToRemove == null ? null : getFixFactory().createModifierListFix(modifierList, modifierToRemove, false, false);
-      QuickFixAction.registerQuickFixAction(highlightInfo, fix);
+      QuickFixAction.registerQuickFixAction(highlightInfo, getFixFactory().createModifierListFix(modifierList, modifier, false, false));
       return highlightInfo;
     }
 
     return null;
   }
 
-  @PsiModifier.ModifierConstant @Nullable
-  private static String getModifierToRemove(@NotNull PsiModifierList modifierList,
-                                            @PsiModifier.ModifierConstant @NotNull String modifier,
-                                            String incompatible) {
-    if (PsiModifier.FINAL.equals(incompatible)) {
-      PsiElement parent = modifierList.getParent();
-      if (parent instanceof PsiMethod) {
-        PsiClass aClass = ((PsiMethod)parent).getContainingClass();
-        if (aClass == null) return null;
-        if (aClass.isInterface()) return PsiModifier.FINAL;
-      }
-    }
-    return modifier;
-  }
-
   /**
    * Checks if the supplied modifier list contains incompatible modifiers (e.g. "public private").
    *
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterDefaultFinalMethod1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterDefaultFinalMethod1.java
deleted file mode 100644
index 0cda730b8758..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterDefaultFinalMethod1.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// "Make 'x' not final" "true"
-interface X {
-  default void x() {}
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterDefaultFinalMethod2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterDefaultFinalMethod2.java
deleted file mode 100644
index 4f377145e274..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterDefaultFinalMethod2.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// "Make 'x' not default" "true"
-abstract class X {
-  final void x() {}
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterFinalStaticMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterFinalStaticMethod.java
deleted file mode 100644
index eb69c8eacd49..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/afterFinalStaticMethod.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// "Make 'x' not final" "true"
-interface X {
-  static void x() {}
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeDefaultFinalMethod1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeDefaultFinalMethod1.java
deleted file mode 100644
index fdf3c0ca3771..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeDefaultFinalMethod1.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// "Make 'x' not final" "true"
-interface X {
-  default<caret> final void x() {}
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeDefaultFinalMethod2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeDefaultFinalMethod2.java
deleted file mode 100644
index 7e45c97c3e6d..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeDefaultFinalMethod2.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// "Make 'x' not default" "true"
-abstract class X {
-  default<caret> final void x() {}
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeFinalStaticMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeFinalStaticMethod.java
deleted file mode 100644
index 0b8dcd05890c..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeFinalStaticMethod.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// "Make 'x' not final" "true"
-interface X {
-  static<caret> final void x() {}
-}