diff --git a/java/java-backend/resources/META-INF/JavaPlugin.xml b/java/java-backend/resources/META-INF/JavaPlugin.xml
index ed36b41f916e..e6ab836811d7 100644
--- a/java/java-backend/resources/META-INF/JavaPlugin.xml
+++ b/java/java-backend/resources/META-INF/JavaPlugin.xml
@@ -1187,7 +1187,6 @@
                                               converter="com.intellij.codeInsight.completion.MethodCallRegistrationHandler$Converter"
                                               descriptor="com.intellij.codeInsight.completion.NoOpFrontendFriendlyInsertHandler"/>
 
-    <codeInsight.completion.command.factory language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.JavaCommandCompletionFactory" />
     <codeInsight.completion.intention.skipper language="JAVA"
                                               implementationClass="com.intellij.codeInsight.completion.commands.JavaIntentionCommandSkipper"/>
     <codeInsight.completion.intention.skipper language="JAVA"
diff --git a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
index 7e50474ac47f..e9d4f8cfe85f 100644
--- a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
+++ b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
@@ -95,5 +95,7 @@
     <declarationRangeHandler key="com.intellij.psi.PsiMethod"
                              implementationClass="com.intellij.codeInsight.hint.MethodDeclarationRangeHandler"/>
 
+    <codeInsight.completion.command.factory language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.JavaCommandCompletionFactory" />
+
   </extensions>
 </idea-plugin>
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/commands/JavaCommandCompletionFactory.java b/java/java-frontback-impl/src/com/intellij/codeInsight/completion/commands/JavaCommandCompletionFactory.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/completion/commands/JavaCommandCompletionFactory.java
rename to java/java-frontback-impl/src/com/intellij/codeInsight/completion/commands/JavaCommandCompletionFactory.java