diff --git a/java/debugger/impl/src/com/intellij/debugger/DebugEnvironment.java b/java/debugger/impl/src/com/intellij/debugger/DebugEnvironment.java
index f194cb3a0959..85f452fcec1a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/DebugEnvironment.java
+++ b/java/debugger/impl/src/com/intellij/debugger/DebugEnvironment.java
@@ -40,17 +40,7 @@ public interface DebugEnvironment {
 
   RemoteConnection getRemoteConnection();
 
-  /**
-   * @deprecated use {@link #getPollTimeout()}
-   */
-  default boolean isPollConnection() {
-    return false;
-  }
-
-  default long getPollTimeout() {
-    //noinspection deprecation
-    return isPollConnection() ? LOCAL_START_TIMEOUT : 0;
-  }
+  long getPollTimeout();
 
   String getSessionName();
 }
diff --git a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java
index 6db57353a141..c4fecc824c93 100644
--- a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java
+++ b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -159,8 +159,8 @@ public class JavaDebuggerLauncherImpl extends JavaDebuggerLauncher {
     }
 
     @Override
-    public boolean isPollConnection() {
-      return true;
+    public long getPollTimeout() {
+      return LOCAL_START_TIMEOUT;
     }
 
     @Override