* Connection wait timeout set to 10 seconds. Dialog to user will be shown in any case.
diff --git a/rse/plugins/org.eclipse.dltk.rse.core/src/org/eclipse/dltk/core/internal/rse/RSEConnectionQueryManager.java b/rse/plugins/org.eclipse.dltk.rse.core/src/org/eclipse/dltk/core/internal/rse/RSEConnectionQueryManager.java
index dfa906a..b8dee08 100644
--- a/rse/plugins/org.eclipse.dltk.rse.core/src/org/eclipse/dltk/core/internal/rse/RSEConnectionQueryManager.java
+++ b/rse/plugins/org.eclipse.dltk.rse.core/src/org/eclipse/dltk/core/internal/rse/RSEConnectionQueryManager.java
@@ -22,7 +22,7 @@
 	/**
 	 * 5 minutes for connection to be established.
 	 */
-	private static final long CONNECTION_TIMEOUT = 1000 * 60 * 2;
+	private static final long CONNECTION_TIMEOUT = 1000 * 10; // ten seconds.
 
 	private static RSEConnectionQueryManager queryManager = null;
 
@@ -178,7 +178,8 @@
 					requests.wait(100);
 					long currentTime = System.currentTimeMillis();
 					if (currentTime > endTime) {
-						markHostAsFinished(host);
+						// Just break
+						// markHostAsFinished(host);
 						break;
 					}
 				} catch (InterruptedException e) {