diff --git a/installer/resources/eepsite/contexts/cgi-context.xml b/installer/resources/eepsite/contexts/cgi-context.xml
index 01df01123..599d90a78 100644
--- a/installer/resources/eepsite/contexts/cgi-context.xml
+++ b/installer/resources/eepsite/contexts/cgi-context.xml
@@ -33,11 +33,13 @@ Configure a custom context for the eepsite.
     <Arg>org.eclipse.jetty.servlets.CGI</Arg>
     <Arg>/</Arg>
   </Call>
+  <!-- See base-context.xml for info.
+       Unlike for DefaultServlet, there's not even a theoretical
+       inefficiency for using this.
+    -->
+  <!-- FIXME broken, threads get hung -->
+<!--
   <Call name="addFilter">
-    <!-- See base-context.xml for info.
-         Unlike for DefaultServlet, there's not even a theoretical
-         inefficiency for using this.
-      -->
     <Arg>
       <New class="org.eclipse.jetty.servlet.FilterHolder" >
         <Arg>
@@ -64,4 +66,5 @@ Configure a custom context for the eepsite.
       </Call>
     </Arg>
   </Call>
+-->
 </Configure>