diff --git a/platform/indexing-impl/src/com/intellij/util/indexing/FindSymbolParameters.java b/platform/indexing-impl/src/com/intellij/util/indexing/FindSymbolParameters.java
index 75cdc7d92ba0..71591b2cdaae 100644
--- a/platform/indexing-impl/src/com/intellij/util/indexing/FindSymbolParameters.java
+++ b/platform/indexing-impl/src/com/intellij/util/indexing/FindSymbolParameters.java
@@ -25,7 +25,7 @@ public class FindSymbolParameters {
   private final String myCompletePattern;
   private final String myLocalPatternName;
   private final GlobalSearchScope mySearchScope;
-  private volatile IdFilter myIdFilter;
+  private final IdFilter myIdFilter;
 
   public FindSymbolParameters(@NotNull String pattern, @NotNull String name, @NotNull GlobalSearchScope scope, @Nullable IdFilter idFilter) {
     myCompletePattern = pattern;
@@ -50,10 +50,6 @@ public class FindSymbolParameters {
     return myIdFilter;
   }
 
-  public void setIdFilter(IdFilter idFilter) {
-    myIdFilter = idFilter;
-  }
-
   public static FindSymbolParameters wrap(@NotNull String pattern, @NotNull Project project, boolean searchInLibraries) {
     return new FindSymbolParameters(
       pattern,
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
index db8bc6d5ac42..c40831d276de 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
@@ -202,9 +202,6 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModelE
           long contributorStarted = System.currentTimeMillis();
 
           if (contributor instanceof ChooseByNameContributorEx) {
-            if (parameters.getIdFilter() == null) {
-              parameters.setIdFilter(getIdFilter(searchInLibraries));
-            }
             ((ChooseByNameContributorEx)contributor).processElementsWithName(name, new Processor<NavigationItem>() {
               @Override
               public boolean process(NavigationItem item) {