diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 429d55c3903..968d3f14059 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -5,17 +5,10 @@
 	<!-- Add on <ant> task for each top level element being built. -->
 	<!-- ===================================================================== -->
 	<target name="allElements">
-		<!--
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.sdk" />
 		</ant>
-		-->
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.apache.commons_net" />
-		</ant>
-		<!--
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.core" />
@@ -52,7 +45,6 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.tm.discovery" />
 		</ant>
-		-->
 	</target>
 
 	<!-- ===================================================================== -->
@@ -122,12 +114,6 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.apache.commons_net">
-		<property name="archiveName" value="TM-apache-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
 	<target name="unpackUpdateJarsForPackaging" depends="myInit">
 		<property name="tmpsite" value="${buildDirectory}/tmpsite" />
 		<mkdir dir="${tmpsite}/new/eclipse/features" />
@@ -276,6 +262,8 @@
 	<!-- Steps to do before running assemble. -->
 	<!-- ===================================================================== -->
 	<target name="preAssemble">
+		<antcall target="serverruntime" />
+		<antcall target="hideServerStuff" />
 		<antcall target="allElements">
 			<param name="target" value="gatherSources" />
 		</antcall>
@@ -285,6 +273,7 @@
 	<!-- Steps to do after  running assemble. -->
 	<!-- ===================================================================== -->
 	<target name="postAssemble">
+		<antcall target="revealServerStuff" />
 	</target>
 
 	<!-- ===================================================================== -->