diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java b/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java
index 0fc54f980819..556e86b9439b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java
@@ -35,19 +35,27 @@ public abstract class BuildTargetScopeProvider {
   public static final ExtensionPointName<BuildTargetScopeProvider> EP_NAME = ExtensionPointName.create("com.intellij.compiler.buildTargetScopeProvider");
 
   /**
-   * @deprecated override {@link #getBuildTargetScopes(com.intellij.openapi.compiler.CompileScope, com.intellij.openapi.compiler.CompilerFilter, com.intellij.openapi.project.Project, boolean)} instead
+   * @deprecated override {@link #getBuildTargetScopes(CompileScope, Project, boolean)} instead
    */
+  @SuppressWarnings("DeprecatedIsStillUsed")
   @NotNull
   public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter,
                                                                   @NotNull Project project) {
     return Collections.emptyList();
   }
 
-
+  /**
+   * @deprecated override {@link #getBuildTargetScopes(CompileScope, Project, boolean)} instead
+   */
+  @SuppressWarnings("DeprecatedIsStillUsed")
   @NotNull
   public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter,
                                                                   @NotNull Project project, boolean forceBuild) {
     return getBuildTargetScopes(baseScope, filter, project);
   }
 
+  @NotNull
+  public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull Project project, boolean forceBuild) {
+    return getBuildTargetScopes(baseScope, CompilerFilter.ALL, project, forceBuild);
+  }
 }
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index 8cf7d509e391..06b946691090 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -57,7 +57,6 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.util.Chunk;
 import com.intellij.util.ThrowableRunnable;
 import com.intellij.util.containers.ContainerUtil;
-import java.util.HashMap;
 import com.intellij.util.containers.MultiMap;
 import com.intellij.util.messages.MessageBus;
 import com.intellij.util.text.DateFormatUtil;
@@ -213,7 +212,7 @@ public class CompileDriver {
     for (BuildTargetScopeProvider provider : BuildTargetScopeProvider.EP_NAME.getExtensions()) {
       List<TargetTypeBuildScope> providerScopes = ReadAction.compute(
         () -> myProject.isDisposed() ? Collections.emptyList()
-                                     : provider.getBuildTargetScopes(scope, myCompilerFilter, myProject, forceBuild));
+                                     : provider.getBuildTargetScopes(scope, myProject, forceBuild));
       scopes = CompileScopeUtil.mergeScopes(scopes, providerScopes);
     }
     return scopes;
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactBuildTargetScopeProvider.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactBuildTargetScopeProvider.java
index 22a4325311fe..988986327425 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactBuildTargetScopeProvider.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactBuildTargetScopeProvider.java
@@ -20,7 +20,6 @@ import com.intellij.compiler.impl.CompileScopeUtil;
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.compiler.CompileScope;
-import com.intellij.openapi.compiler.CompilerFilter;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.packaging.artifacts.Artifact;
@@ -40,12 +39,8 @@ import java.util.Set;
 public class ArtifactBuildTargetScopeProvider extends BuildTargetScopeProvider {
   @NotNull
   @Override
-  public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull final CompileScope baseScope, @NotNull CompilerFilter filter,
+  public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull final CompileScope baseScope,
                                                          @NotNull final Project project, final boolean forceBuild) {
-    final ArtifactsCompiler compiler = ArtifactsCompiler.getInstance(project);
-    if (compiler == null || !filter.acceptCompiler(compiler)) {
-      return Collections.emptyList();
-    }
     final List<TargetTypeBuildScope> scopes = new ArrayList<>();
     new ReadAction() {
       protected void run(@NotNull final Result result) {
diff --git a/plugins/devkit/src/build/PluginModuleBuildScopeProvider.java b/plugins/devkit/src/build/PluginModuleBuildScopeProvider.java
index a9b5a2dfbad0..b810307fb329 100644
--- a/plugins/devkit/src/build/PluginModuleBuildScopeProvider.java
+++ b/plugins/devkit/src/build/PluginModuleBuildScopeProvider.java
@@ -17,7 +17,6 @@ package org.jetbrains.idea.devkit.build;
 
 import com.intellij.compiler.impl.BuildTargetScopeProvider;
 import com.intellij.openapi.compiler.CompileScope;
-import com.intellij.openapi.compiler.CompilerFilter;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
@@ -36,8 +35,7 @@ import java.util.List;
 public class PluginModuleBuildScopeProvider extends BuildTargetScopeProvider {
   @NotNull
   @Override
-  public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter,
-                                                         @NotNull Project project, boolean forceBuild) {
+  public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull Project project, boolean forceBuild) {
     List<String> pluginArtifactTargetIds = new ArrayList<>();
     for (Module module : baseScope.getAffectedModules()) {
       if (PluginModuleType.isOfType(module)) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyTargetScopeProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyTargetScopeProvider.java
index c1f283606bd7..09fcd04804ea 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyTargetScopeProvider.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyTargetScopeProvider.java
@@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.compiler;
 
 import com.intellij.compiler.impl.BuildTargetScopeProvider;
 import com.intellij.openapi.compiler.CompileScope;
-import com.intellij.openapi.compiler.CompilerFilter;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
@@ -46,7 +45,6 @@ public class GroovyTargetScopeProvider extends BuildTargetScopeProvider {
   @NotNull
   @Override
   public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope,
-                                                         @NotNull CompilerFilter filter,
                                                          @NotNull Project project,
                                                          boolean forceBuild) {
     Boolean checkResourcesRebuild = baseScope.getUserData(GroovyResourceChecker.CHECKING_RESOURCES_REBUILD);