fallback for 22168
diff --git a/org.eclipse.jdt.debug/buildnotes_jdt-debug.html b/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
index 571d316..59c5e12 100644
--- a/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
+++ b/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
@@ -20,7 +20,6 @@
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47256">47256</a>: CoreException from launch configuration referencing closed project<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48381">48381</a>: Unneccessary memory held in debug view elements after termination<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47275">47275</a>: Missing files in the distribution of org.eclipse.jdt.ui.javafamily<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22168">22168</a>: JDI layer hangs in JDI handshake<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45479">45479</a>: Cannot set breakpoint on line which contains only string or number litteral<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46001">46001</a>: JRERuntimeClasspathEntryResolver#resolveLibraryLocations() should return only the bootstrap classes when asked for the bootstrap classes<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42165">42165</a>: Cannot remove default JRE<br>
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java
index a4d0a4d..8fffbcf 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java
@@ -99,7 +99,7 @@
 	public VirtualMachine attach(Map connectionArgs) throws IOException, IllegalConnectorArgumentsException {
 		getConnectionArguments(connectionArgs);
 		try {
-			((SocketTransportImpl)fTransport).attach(fHostname, fPort, virtualMachineManager().getGlobalRequestTimeout());
+			((SocketTransportImpl)fTransport).attach(fHostname, fPort);
 		} catch (IllegalArgumentException e) {
 			List args = new ArrayList();
 			args.add("hostname"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
index 92c3452..3185a0f 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
@@ -43,9 +43,8 @@
 	/**
 	 * Establishes a client connection to a virtual machine.
 	 */
-	public void attach(String hostname, int port, int timeout) throws IOException {
+	public void attach(String hostname, int port) throws IOException {
 		fSocket = new Socket(hostname, port);
-		fSocket.setSoTimeout(timeout);
 		PerformHandshake();
 	}