diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
index 5b4ee0cd182..074f0a55266 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -574,7 +574,6 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
         }
 
         try
-                    if (cause instanceof BadMessageException)
         {
             _state.onError(failure);
         }
@@ -596,13 +595,13 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
             _response.reset(true);
             _response.setStatus(code == null ? 500 : code);
             _response.flushBuffer();
-            }
         }
         catch (Throwable x)
         {
             if (x != failure)
                 failure.addSuppressed(x);
             abort(failure);
+        }
     }
 
     /** Unwrap failure causes to find target class
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java
index 52fb4b58795..6d909bc4eda 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java
@@ -28,11 +28,13 @@ import static org.junit.Assert.assertThat;
 import java.io.IOException;
 
 import javax.servlet.ServletException;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.http.BadMessageException;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpTester;
diff --git a/pom.xml b/pom.xml
index 6e30cac2ef3..e19d60bd7e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1373,60 +1373,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>eclipse-sign</id>
-      <activation>
-        <property>
-          <name>eclipse-sign</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho-version}</version>
-            <executions>
-              <execution>
-                <id>pack200-normalize</id>
-                <goals>
-                  <goal>normalize</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.cbi.maven.plugins</groupId>
-            <artifactId>eclipse-jarsigner-plugin</artifactId>
-	        <version>${cbi-plugins.version}</version>
-            <executions>
-              <execution>
-                <id>sign</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho-version}</version>
-            <executions>
-              <execution>
-                <id>pack200-pack</id>
-                <goals>
-                  <goal>pack</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>8u00</id>
       <activation>