diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
index 02173c4bad55..c2a2f7152e8c 100644
--- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
@@ -62,12 +62,9 @@ abstract class BaseIdeaProperties extends ProductProperties {
     "intellij.configurationScript",
     "intellij.yaml",
     "intellij.tasks.core",
-    "intellij.tasks.java",
     "intellij.maven",
     "intellij.gradle",
     "intellij.vcs.git",
-    "intellij.platform.remoteServers.git",
-    "intellij.java.remoteServers.git",
     "intellij.vcs.svn",
     "intellij.vcs.hg",
     "intellij.vcs.github",
@@ -87,9 +84,6 @@ abstract class BaseIdeaProperties extends ProductProperties {
     "intellij.devkit",
     "intellij.eclipse",
     "intellij.platform.langInjection",
-    "intellij.java.langInjection",
-    "intellij.xml.langInjection",
-    "intellij.java.langInjection.jps",
     "intellij.java.debugger.streams",
     "intellij.android.smali",
     "intellij.statsCollector",
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index 218fb680ccf6..b01fa5016650 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -105,8 +105,8 @@ class CommunityRepositoryModules {
     },
     plugin("intellij.vcs.git") {
       withModule("intellij.vcs.git.rt", "git4idea-rt.jar", null)
-      withOptionalModule("intellij.platform.remoteServers.git")
-      withOptionalModule("intellij.java.remoteServers.git", "remote-servers-git.jar")
+      withModule("intellij.platform.remoteServers.git")
+      withModule("intellij.java.remoteServers.git", "remote-servers-git.jar")
     },
     plugin("intellij.vcs.cvs") {
       directoryName = "cvsIntegration"
@@ -119,9 +119,9 @@ class CommunityRepositoryModules {
       withModule("intellij.xslt.debugger.rt", "rt/xslt-rt.jar")
     },
     plugin("intellij.platform.langInjection") {
-      withOptionalModule("intellij.java.langInjection", "IntelliLang.jar")
-      withOptionalModule("intellij.xml.langInjection", "IntelliLang.jar")
-      withOptionalModule("intellij.java.langInjection.jps", "intellilang-jps-plugin.jar")
+      withModule("intellij.java.langInjection", "IntelliLang.jar")
+      withModule("intellij.xml.langInjection", "IntelliLang.jar")
+      withModule("intellij.java.langInjection.jps", "intellilang-jps-plugin.jar")
       doNotCreateSeparateJarForLocalizableResources()
     },
     plugin("intellij.tasks.core") {
@@ -129,7 +129,7 @@ class CommunityRepositoryModules {
       withModule("intellij.tasks")
       withModule("intellij.tasks.compatibility")
       withModule("intellij.tasks.jira")
-      withOptionalModule("intellij.tasks.java")
+      withModule("intellij.tasks.java")
       doNotCreateSeparateJarForLocalizableResources()
     },
     plugin("intellij.xslt.debugger") {
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy
index f0e3d35a80a9..73bf1ce4d8cd 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayout.groovy
@@ -170,6 +170,9 @@ class PluginLayout extends BaseLayout {
      * distribution only if they are added to {@link org.jetbrains.intellij.build.ProductModulesLayout#bundledPluginModules} list.
      * @param relativeJarPath target JAR path relative to 'lib' directory of the plugin; different modules may be packed into the same JAR,
      * but <strong>don't use this for new plugins</strong>; this parameter is temporary added to keep layout of old plugins.
+     *
+     * @deprecated if a module is not included into the plugin in some IDE, it may cause problems if a plugin it optionally depends on is installed
+     * as a custom plugin, so it isn't recommended to use optional dependencies. Use {@link #withModule(java.lang.String, java.lang.String)} instead.
      */
     void withOptionalModule(String moduleName, String relativeJarPath) {
       layout.optionalModules << moduleName
@@ -179,6 +182,9 @@ class PluginLayout extends BaseLayout {
     /**
      * Register an optional module which may be excluded from the plugin distribution in some products. These modules are included in plugin
      * distribution only if they are added to {@link org.jetbrains.intellij.build.ProductModulesLayout#bundledPluginModules} list.
+     *
+     * @deprecated if a module is not included into the plugin in some IDE, it may cause problems if a plugin it optionally depends on is installed
+     * as a custom plugin, so it isn't recommended to use optional dependencies. Use  {@link #withModule(java.lang.String)} instead.
      */
     void withOptionalModule(String moduleName) {
       layout.optionalModules << moduleName
diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt
index 1f8733b65649..a62c341b1c56 100644
--- a/python/build/plugin-list.txt
+++ b/python/build/plugin-list.txt
@@ -2,7 +2,6 @@ intellij.configurationScript
 intellij.copyright
 intellij.editorconfig
 intellij.platform.langInjection
-intellij.platform.remoteServers.git
 intellij.properties
 intellij.python.copyright
 intellij.python.langInjection
@@ -17,5 +16,4 @@ intellij.vcs.git
 intellij.vcs.github
 intellij.vcs.hg
 intellij.vcs.svn
-intellij.xml.langInjection
 intellij.yaml
\ No newline at end of file