diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
index c6cbb38b5a9d..d2e5dee43390 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
@@ -249,10 +249,6 @@ public class CreateMethodFromUsageFix extends CreateFromUsageBaseFix {
     final Editor newEditor = positionCursor(project, targetFile, method);
     if (newEditor == null) return;
     Template template = builder.buildTemplate();
-    if (arguments.size() > 20) {
-      template.setToShortenLongNames(false);
-      template.setToReformat(false);
-    }
     newEditor.getCaretModel().moveToOffset(rangeMarker.getStartOffset());
     newEditor.getDocument().deleteString(rangeMarker.getStartOffset(), rangeMarker.getEndOffset());
     rangeMarker.dispose();
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsagePerformanceTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsagePerformanceTest.java
index b18f201a748e..d2646f7520ca 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsagePerformanceTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsagePerformanceTest.java
@@ -23,11 +23,12 @@ import com.intellij.testFramework.SkipSlowTestLocally;
 public class CreateMethodFromUsagePerformanceTest extends LightQuickFixTestCase {
 
   public void testWithHugeNumberOfParameters() {
-    PlatformTestUtil.startPerformanceTest("100 args for a new method", 200000, () -> {
+    PlatformTestUtil.startPerformanceTest("5000 args for a new method", 2000000, () -> {
       configureFromFileText("Foo.java", "class Foo {{ f<caret>oo(" + StringUtil.repeat("\"a\", ", 5000) + " \"a\");}}");
       doAction("Create method 'foo'");
     })
-      .useLegacyScaling()
+      .cpuBound()
+      .usesAllCPUCores()
       .assertTiming();
   }