--- a/components/tomcat-8/patches/build.xml.patch	Thu Dec 03 10:38:43 2015 -0800
+++ b/components/tomcat-8/patches/build.xml.patch	Wed Dec 02 04:42:16 2015 -0800
@@ -6,7 +6,7 @@
 
 --- build.xml
 +++ build.xml
-@@ -999,13 +999,6 @@
+@@ -988,13 +988,6 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
  
@@ -20,7 +20,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -2744,27 +2737,6 @@
+@@ -2796,27 +2789,6 @@
    <target name="download-compile"
            description="Download (and build) components necessary to compile" >
  
@@ -48,19 +48,3 @@
      <!-- Download JDT (Eclipse compiler) -->
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${jdt.loc.1}"/>
-@@ -2775,15 +2747,6 @@
- 
-   </target>
- 
--  <target name="download-npn"
--          description="Download optional NPN" >
--    <antcall target="downloadfile">
--     <param name="sourcefile" value="${npn.loc}"/>
--     <param name="destfile" value="${npn.jar}"/>
--     <param name="destdir" value="${npn.home}"/>
--    </antcall>
--  </target>
--
-   <target name="download-test-compile"
-           description="Download additional components for the tests" >
-