diff --git a/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java b/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java
index c9c39116929b..e1b815afecf2 100644
--- a/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java
@@ -53,7 +53,7 @@ public class XmlRpcServerImpl extends SimpleChannelUpstreamHandler implements Xm
 
   @Override
   public void consume(ChannelPipeline pipeline) {
-    pipeline.addLast("xmlRpc", this);
+    pipeline.addLast("pluggable_xmlRpc", this);
   }
 
   public int getPortNumber() {
diff --git a/platform/platform-impl/src/org/jetbrains/io/WebServer.java b/platform/platform-impl/src/org/jetbrains/io/WebServer.java
index fce5d8304612..524ca88acade 100644
--- a/platform/platform-impl/src/org/jetbrains/io/WebServer.java
+++ b/platform/platform-impl/src/org/jetbrains/io/WebServer.java
@@ -116,6 +116,14 @@ public class WebServer {
     Runtime.getRuntime().addShutdownHook(new Thread(createShutdownTask()));
   }
 
+  public static void removePluggableHandlers(ChannelPipeline pipeline) {
+    for (String name : pipeline.getNames()) {
+      if (name.startsWith("pluggable_")) {
+        pipeline.remove(name);
+      }
+    }
+  }
+
   private static class ChannelPipelineFactoryImpl implements ChannelPipelineFactory {
     private final Computable<Consumer<ChannelPipeline>[]> pipelineConsumers;
     private final DefaultHandler defaultHandler;