diff --git a/.idea/artifacts/KotlinAndroidExtensions.xml b/.idea/artifacts/KotlinAndroidExtensions.xml
index da5017a9c85..3c119b585b9 100644
--- a/.idea/artifacts/KotlinAndroidExtensions.xml
+++ b/.idea/artifacts/KotlinAndroidExtensions.xml
@@ -1,12 +1,6 @@
 <component name="ArtifactManager">
   <artifact name="KotlinAndroidExtensions">
     <output-path>$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions</output-path>
-    <properties id="ant-preprocessing">
-      <options enabled="true">
-        <file>file://$PROJECT_DIR$/replicate_versions.xml</file>
-        <target>replicateIdeaVersions</target>
-      </options>
-    </properties>
     <root id="root">
       <element id="directory" name="lib">
         <element id="archive" name="kotlin-android-extensions.jar">
diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 4a986502796..786a9222058 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -1,5 +1,6 @@
 <project name="Jet CI Steps" default="none">
     <import file="build.xml" optional="false"/>
+    <import file="replicate_versions.xml" optional="false"/>
 
     <property name="build.number" value="snapshot"/>
     <property name="jdk16.home" value="${java.home}"/>
@@ -97,6 +98,8 @@
           target.file.bk="${compiler.version.java.bk}"
           target.file.versioned="${compiler.version.java.versioned}"
           test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
+
+      <replicateIdeaVersion target.file="${android-extensions.plugin.xml}" />
     </target>
 
   <target name="revertTemplateFiles">
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 8770f22e4a1..d707bab0997 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,6 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains s.r.o.</vendor>
 
-  <!-- Run replicateIdeaVersions Ant task after changing the versions. -->
   <idea-version since-build="141.2" until-build="141.9999"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml
index 0210698ee1c..877dc91afbf 100644
--- a/plugins/android-idea-plugin/src/META-INF/plugin.xml
+++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="141.2" until-build="141.9999"/>
+  <!-- IDEA VERSION -->
 
   <depends optional="false">org.jetbrains.kotlin</depends>
   <depends optional="false">org.jetbrains.android</depends>
diff --git a/replicate_versions.xml b/replicate_versions.xml
index cfa29ef0864..c5eb6b0c553 100644
--- a/replicate_versions.xml
+++ b/replicate_versions.xml
@@ -5,6 +5,7 @@
     <macrodef name="replicateIdeaVersion">
         <attribute name="target.file"/>
         <attribute name="idea-version-pattern" default="&lt;idea-version since-build=&quot;[0-9.]+&quot; until-build=&quot;[0-9.]+&quot;/&gt;"/>
+        <attribute name="replace-pattern" default="&lt;!-- IDEA VERSION --&gt;"/>
 
         <sequential>
             <loadfile srcfile="${plugin.xml}" property="main.plugin.version">
@@ -34,11 +35,7 @@
                 </condition>
             </fail>
 
-            <replaceregexp file="@{target.file}" byline="true" match="@{idea-version-pattern}" replace="${main.plugin.version}" />
+            <replaceregexp file="@{target.file}" byline="true" match="@{replace-pattern}" replace="${main.plugin.version}" />
         </sequential>
     </macrodef>
-
-    <target name="replicateIdeaVersions">
-        <replicateIdeaVersion target.file="${android-extensions.plugin.xml}" />
-    </target>
 </project>