diff --git a/update_dependencies.xml b/update_dependencies.xml
index bbf86bbeac5..cb667fd4391 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -14,10 +14,6 @@
         />
     </target>
 
-    <target name="update-no-third-party">
-        <execute_update/>
-    </target>
-
     <target name="fetch-third-party">
         <mkdir dir="dependencies"/>
         <mkdir dir="dependencies/download"/>
@@ -98,13 +94,13 @@
              dest="dependencies/download/jansi-1.9-sources.jar" usetimestamp="true"/>
         <copy file="dependencies/download/jansi-1.9-sources.jar" tofile="dependencies/jansi-sources.jar" overwrite="true"/>
 
-
         <!-- ASM 4 -->
-        <asm4/>
+        <get-asm4-and-rename-packages/>
     </target>
 
-    <macrodef name="asm4">
+    <macrodef name="get-asm4-and-rename-packages">
         <sequential>
+            <!-- Download vanilla ASM 4.0 & unzip the needed jars and sources -->
             <get src="http://download.forge.objectweb.org/asm/asm-4.0-bin.zip"
                  dest="dependencies/download/asm-4.0-bin.zip" usetimestamp="true"/>
 
@@ -112,32 +108,15 @@
             <unzip src="dependencies/download/asm-4.0-bin.zip" dest="dependencies/download/asm">
                 <patternset>
                     <include name="asm-4.0/lib/asm-util-4.0.jar"/>
-                    <!--<include name="asm-4.0/lib/asm-tree-4.0.jar"/>-->
-                    <!--<include name="asm-4.0/lib/asm-commons-4.0.jar"/>-->
                     <include name="asm-4.0/lib/asm-analysis-4.0.jar"/>
-                    <!--<include name="asm-4.0/lib/asm-4.0.jar"/>-->
                     <include name="asm-4.0/src.zip"/>
                 </patternset>
                 <mapper type="flatten"/>
             </unzip>
-            <unzip src="dependencies/download/asm/src.zip" dest="dependencies/download/asm/src">
-                <patternset>
-                    <include name="**/*"/>
-                </patternset>
-            </unzip>
 
+            <!-- Rename packages in the jars -->
             <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
 
-            <!--
-            <jarjar jarfile="dependencies/jetbrains-asm-all-4.0.jar">
-                <zipfileset src="dependencies/download/asm/asm-tree-4.0.jar"/>
-                <zipfileset src="dependencies/download/asm/asm-commons-4.0.jar"/>
-                <zipfileset src="dependencies/download/asm/asm-4.0.jar"/>
-
-                <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
-            </jarjar>
-            -->
-
             <jarjar jarfile="dependencies/jetbrains-asm-util-4.0.jar">
                 <zipfileset src="dependencies/download/asm/asm-util-4.0.jar"/>
 
@@ -150,10 +129,14 @@
                 <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
             </jarjar>
 
-            <replaceregexp
-                match="org.objectweb.asm"
-                replace="org.jetbrains.asm4"
-              >
+            <!-- Rename packages in the sources -->
+            <unzip src="dependencies/download/asm/src.zip" dest="dependencies/download/asm/src">
+                <patternset>
+                    <include name="**/*"/>
+                </patternset>
+            </unzip>
+
+            <replaceregexp match="org.objectweb.asm" replace="org.jetbrains.asm4">
                 <fileset dir="dependencies/download/asm/src/">
                     <include name="**/*.java"/>
                 </fileset>