diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java b/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java
index 098501af7489..6109e9a41598 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java
@@ -164,8 +164,10 @@ public abstract class XDebuggerEvaluator {
     return text;
   }
 
+  @Deprecated
   /**
    * @return delay before showing value tooltip (in ms)
+   * @deprecated Since IDEA 14 it is a platform setting
    */
   public int getValuePopupDelay() {
     return XDebuggerSettingsManager.getInstance().getDataViewSettings().getValueLookupDelay();
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
index bf3e0010e6cf..0ccd488e9f9b 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
@@ -100,14 +100,7 @@ public class XQuickEvaluateHandler extends QuickEvaluateHandler {
   }
 
   @Override
-  public int getValueLookupDelay(final Project project) {
-    XDebugSession session = XDebuggerManager.getInstance(project).getCurrentSession();
-    if (session != null) {
-      XDebuggerEvaluator evaluator = session.getDebugProcess().getEvaluator();
-      if (evaluator != null) {
-        return evaluator.getValuePopupDelay();
-      }
-    }
+  public int getValueLookupDelay(Project project) {
     return XDebuggerSettingsManager.getInstance().getDataViewSettings().getValueLookupDelay();
   }
 }