diff --git a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
index 53fadb9cb463..996c42f6d6ab 100644
--- a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
@@ -3,8 +3,6 @@ package org.jetbrains.intellij.build
 
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
-import org.jetbrains.intellij.build.python.PythonCommunityPluginModules
-
 /**
  * @author nik
  */
@@ -27,7 +25,7 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
     productLayout.additionalPlatformJars.put("resources.jar", "intellij.idea.community.resources")
     productLayout.bundledPluginModules = BUNDLED_PLUGIN_MODULES
     productLayout.prepareCustomPluginRepositoryForPublishedPlugins = false
-    productLayout.compatiblePluginsToIgnore = PythonCommunityPluginModules.PYCHARM_ONLY_PLUGIN_MODULES + ["intellij.java.plugin"]
+    productLayout.compatiblePluginsToIgnore = ["intellij.java.plugin"]
     productLayout.allNonTrivialPlugins = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS + [
       JavaPluginLayout.javaPlugin(false),
       CommunityRepositoryModules.androidPlugin([:]),
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
index bd678bfdbea2..a833c27d0708 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
@@ -26,19 +26,17 @@ class PythonCommunityPluginModules {
   public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "intellij.python.community.plugin.resources"
 
   static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
-    pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", "intellij.python.community.plugin.dependencies",
-                 COMMUNITY_MODULES) {
+    pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", COMMUNITY_MODULES) {
       withProjectLibrary("markdown4j")  // Required for ipnb
       PYCHARM_ONLY_PLUGIN_MODULES.each { module ->
         excludeFromModule(module, "META-INF/plugin.xml")
       }
-      excludeFromModule(PYTHON_COMMUNITY_PLUGIN_MODULE, "META-INF/python-plugin-dependencies.xml")
       body.delegate = delegate
       body()
     }
   }
 
-  static PluginLayout pythonPlugin(String mainModuleName, String name, String buildPatchesModule, List<String> modules,
+  static PluginLayout pythonPlugin(String mainModuleName, String name, List<String> modules,
                                    @DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
     PluginLayout.plugin(mainModuleName) {
       directoryName = name
@@ -47,7 +45,6 @@ class PythonCommunityPluginModules {
         withModule(module, mainJarName, null)
       }
       withModule(mainModuleName, mainJarName)
-      withModule(buildPatchesModule, mainJarName, null)
       withResourceFromModule("intellij.python.helpers", "", "helpers")
       doNotCreateSeparateJarForLocalizableResources()
       withProjectLibrary("libthrift")  // Required for "Python Console" in intellij.python.community.impl module
diff --git a/python/IntelliLang-python/resources/META-INF/plugin.xml b/python/IntelliLang-python/resources/META-INF/plugin.xml
index c03a43c4121e..0b07f8a07892 100644
--- a/python/IntelliLang-python/resources/META-INF/plugin.xml
+++ b/python/IntelliLang-python/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
   <description>This plugin enables language injections</description>
   <vendor>JetBrains</vendor>
 
-  <depends>com.intellij.modules.python</depends>
+  <depends>com.intellij.modules.pycharm</depends>
   <depends>org.intellij.intelliLang</depends>
 
   <xi:include href="/META-INF/intellilang-python-support.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/python/build/pluginDependencies/META-INF/python-plugin-dependencies.xml b/python/build/pluginDependencies/META-INF/python-plugin-dependencies.xml
deleted file mode 100644
index 33d288ac12f8..000000000000
--- a/python/build/pluginDependencies/META-INF/python-plugin-dependencies.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!-- This version of python-plugin-dependencies.xml is used in release versions of the
-       Python plugin and contains the real list of optional dependencies for the Python plugin.
-  -->
-  <depends optional="true" config-file="python-rest-plugin.xml">org.jetbrains.plugins.rest</depends>
-  <depends optional="true" config-file="python-copyright-plugin.xml">com.intellij.copyright</depends>
-  <depends optional="true" config-file="intellilang-python-support.xml">org.intellij.intelliLang</depends>
-  <depends optional="true" config-file="python-terminal-plugin.xml">org.jetbrains.plugins.terminal</depends>
-
-</idea-plugin>
diff --git a/python/build/pluginDependencies/intellij.python.community.plugin.dependencies.iml b/python/build/pluginDependencies/intellij.python.community.plugin.dependencies.iml
deleted file mode 100644
index 0dde4f4b66c3..000000000000
--- a/python/build/pluginDependencies/intellij.python.community.plugin.dependencies.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
index b6e9e71d8003..343ad45e3c32 100644
--- a/python/pluginResources/META-INF/plugin.xml
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -23,9 +23,8 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
   <depends optional="true" config-file="python-plugin-rider.xml">com.intellij.modules.rider</depends>
   <depends optional="true" config-file="python-plugin-dbide.xml">com.intellij.modules.datagrip</depends>
   <depends optional="true" config-file="python-plugin-goland.xml">com.intellij.modules.go</depends>
-
-  <!-- Two different versions of this file exist: one is used when building from sources (when auxiliary
-     plugins are loaded as separate plugins) and another is used for the real release build (when auxiliary
-     plugins are packed inside the Python plugin jar) -->
-  <xi:include href="/META-INF/python-plugin-dependencies.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <depends optional="true" config-file="python-rest-plugin.xml">org.jetbrains.plugins.rest</depends>
+  <depends optional="true" config-file="python-copyright-plugin.xml">com.intellij.copyright</depends>
+  <depends optional="true" config-file="intellilang-python-support.xml">org.intellij.intelliLang</depends>
+  <depends optional="true" config-file="python-terminal-plugin.xml">org.jetbrains.plugins.terminal</depends>
 </idea-plugin>
diff --git a/python/pluginResources/META-INF/python-plugin-dependencies.xml b/python/pluginResources/META-INF/python-plugin-dependencies.xml
deleted file mode 100644
index ce638d660c19..000000000000
--- a/python/pluginResources/META-INF/python-plugin-dependencies.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<idea-plugin>
-  <!-- This version of python-plugin-dependencies.xml is used when running IntelliJ IDEA with
-       Python plugin from sources. In this configuration, all auxiliary modules (intellij.python.javascript.debugger,
-       intellij.python.localization etc.) are loaded as separate plugins, so they mustnt' be loaded again as
-       parts of the Python plugin.
-
-       The version of python-plugin-dependencies.xml used in production builds can be found under the
-       'build' directory.
-  -->
-</idea-plugin>
diff --git a/python/python-copyright/resources/META-INF/plugin.xml b/python/python-copyright/resources/META-INF/plugin.xml
index 2cd03c47ad48..e849e4db7585 100644
--- a/python/python-copyright/resources/META-INF/plugin.xml
+++ b/python/python-copyright/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
   <id>org.jetbrains.plugins.python-copyright</id>
   <vendor>JetBrains</vendor>
 
-  <depends>com.intellij.modules.python</depends>
+  <depends>com.intellij.modules.pycharm</depends>
   <depends>com.intellij.copyright</depends>
 
   <xi:include href="/META-INF/python-copyright-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/python/python-rest/resources/META-INF/plugin.xml b/python/python-rest/resources/META-INF/plugin.xml
index c4a9e19ab74f..f6f114f88b5d 100644
--- a/python/python-rest/resources/META-INF/plugin.xml
+++ b/python/python-rest/resources/META-INF/plugin.xml
@@ -2,7 +2,7 @@
   <name>Python ReStructureText Integration</name>
   <id>org.jetbrains.plugins.python-rest</id>
   <vendor>JetBrains</vendor>
-  <depends>com.intellij.modules.python</depends>
+  <depends>com.intellij.modules.pycharm</depends>
   <depends>org.jetbrains.plugins.rest</depends>
 
   <xi:include href="/META-INF/python-rest-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/python/python-terminal/resources/META-INF/plugin.xml b/python/python-terminal/resources/META-INF/plugin.xml
index 8f073fe69c78..55bdf78c8b6c 100644
--- a/python/python-terminal/resources/META-INF/plugin.xml
+++ b/python/python-terminal/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
   <id>org.jetbrains.plugins.python-terminal</id>
   <vendor>JetBrains</vendor>
 
-  <depends>com.intellij.modules.python</depends>
+  <depends>com.intellij.modules.pycharm</depends>
   <depends>org.jetbrains.plugins.terminal</depends>
 
   <xi:include href="/META-INF/python-terminal-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>