diff --git a/platform/built-in-server/src/org/jetbrains/ide/XmlRpcServerImpl.java b/platform/built-in-server/src/org/jetbrains/ide/XmlRpcServerImpl.java
index 9b683b53ab65..22fa38db97fb 100644
--- a/platform/built-in-server/src/org/jetbrains/ide/XmlRpcServerImpl.java
+++ b/platform/built-in-server/src/org/jetbrains/ide/XmlRpcServerImpl.java
@@ -17,7 +17,9 @@ package org.jetbrains.ide;
 
 import com.intellij.ide.XmlRpcHandlerBean;
 import com.intellij.ide.XmlRpcServer;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.AbstractExtensionPointBean;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
@@ -48,7 +50,7 @@ public class XmlRpcServerImpl implements XmlRpcServer {
     handlerMapping = new THashMap<String, Object>();
     for (XmlRpcHandlerBean handlerBean : Extensions.getExtensions(XmlRpcHandlerBean.EP_NAME)) {
       try {
-        handlerMapping.put(handlerBean.name, handlerBean.instantiate());
+        handlerMapping.put(handlerBean.name, AbstractExtensionPointBean.instantiate(handlerBean.findClass(handlerBean.implementation), ApplicationManager.getApplication().getPicoContainer(), true));
       }
       catch (ClassNotFoundException e) {
         LOG.error(e);
diff --git a/platform/platform-api/src/com/intellij/ide/XmlRpcHandlerBean.java b/platform/platform-api/src/com/intellij/ide/XmlRpcHandlerBean.java
index dff2f1054814..77630f66b30e 100644
--- a/platform/platform-api/src/com/intellij/ide/XmlRpcHandlerBean.java
+++ b/platform/platform-api/src/com/intellij/ide/XmlRpcHandlerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,10 @@
  */
 package com.intellij.ide;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.extensions.AbstractExtensionPointBean;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.util.xmlb.annotations.Attribute;
 
-/**
- * @author yole
- */
 public class XmlRpcHandlerBean extends AbstractExtensionPointBean {
   public static final ExtensionPointName<XmlRpcHandlerBean> EP_NAME = ExtensionPointName.create("com.intellij.xmlRpcHandler");
 
@@ -31,8 +27,4 @@ public class XmlRpcHandlerBean extends AbstractExtensionPointBean {
 
   @Attribute("implementation")
   public String implementation;
-
-  public Object instantiate() throws ClassNotFoundException {
-    return instantiate(implementation, ApplicationManager.getApplication().getPicoContainer());
-  }
-}
+}
\ No newline at end of file