diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index a7d1f3d735dd..9e1e1341c3eb 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -59,7 +59,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "jsp-openapi",
     "jsp-base-openapi",
     "openapi",
-    "remote-servers-api",
     "remote-servers-java-api",
     "testFramework-java",
   ].flatten()
@@ -79,7 +78,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "jsp-spi",
     "manifest",
     "platform-main",
-    "remote-servers-impl",
     "remote-servers-java-impl",
     "testFramework",
     "tests_bootstrap",
@@ -354,10 +352,8 @@ public def layoutCommunityPlugins(String home) {
       jar("git4idea-rt.jar") {
         module("git4idea-rt")
       }
-      if (!isDefined("pluginFilter")) {//temporary fix to exclude remote-servers-git module from layout for small IDEs because corresponding module isn't compiled
-        jar("remote-servers-git.jar") {
-          module("remote-servers-git")
-        }
+      jar("remote-servers-git.jar") {
+        module("remote-servers-git")
       }
       fileset(dir: "$home/plugins/git4idea/lib") {
         include(name: "trilead-ssh2.jar")
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index dab125f0222f..472cea335c5f 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -261,6 +261,7 @@ binding.setVariable("platformApiModules", [
   "vcs-api",
   "vcs-log-api",
   "xdebugger-api",
+  "remote-servers-api",
   "xml-analysis-api",
   "xml-openapi",
   "xml-psi-api",
@@ -291,6 +292,7 @@ binding.setVariable("platformImplementationModules", [
   "RegExpSupport",
   "spellchecker",
   "xdebugger-impl",
+  "remote-servers-impl",
   "xml",
   "xml-analysis-impl",
   "xml-psi-impl",
diff --git a/plugins/git4idea/src/META-INF/remote-servers-specific.xml b/plugins/git4idea/remote-servers-git/src/META-INF/remote-servers-git.xml
similarity index 100%
rename from plugins/git4idea/src/META-INF/remote-servers-specific.xml
rename to plugins/git4idea/remote-servers-git/src/META-INF/remote-servers-git.xml
diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml
index 46aacc745cca..cf8193d768a9 100644
--- a/plugins/git4idea/src/META-INF/plugin.xml
+++ b/plugins/git4idea/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Git Integration</name>
   <id>Git4Idea</id>
   <description>
@@ -18,7 +18,9 @@
   <vendor url="http://svn.jetbrains.org/idea/Trunk/bundled/git4idea/" logo="/general/ijLogo.png">JetBrains</vendor>
 
   <depends>com.intellij.modules.vcs</depends>
-  <depends optional="true" config-file="remote-servers-specific.xml">com.intellij.modules.ultimate</depends>
+  <xi:include href="/META-INF/remote-servers-git.xml" xpointer="xpointer(/idea-plugin/*)">
+    <xi:fallback/>
+  </xi:include>
 
   <actions>
 
diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt
index 0779cc0c79cf..12c52895cbdc 100644
--- a/python/build/plugin-list.txt
+++ b/python/build/plugin-list.txt
@@ -5,6 +5,7 @@ javacvs-src
 smartcvs-src
 svn4idea
 git4idea
+remote-servers-git
 hg4idea
 tasks
 tasks-core