Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java	(revision 7824)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java	(revision 7826)
@@ -38,5 +38,5 @@
     static final int protocolMinorVersion = 7;
 
-    private static final String LOCALHOST = "localhost";
+    private static final String LOCALHOST = "127.0.0.1";
 
     /**
@@ -84,15 +84,5 @@
      */
     public static InetAddress getInetAddress() throws UnknownHostException {
-        String hostname = Main.pref.get("remote.control.host", LOCALHOST);
-        InetAddress result = InetAddress.getByName(hostname);
-        // Sometimes localhost resolution does not work as expected, see #10833
-        if (LOCALHOST.equalsIgnoreCase(hostname) && !LOCALHOST.equalsIgnoreCase(result.getHostName())) {
-            InetAddress localhostAddr = InetAddress.getLocalHost();
-            // Use this result if it's better. Not sure if it's a Java bug or not
-            if (LOCALHOST.equalsIgnoreCase(localhostAddr.getHostName())) {
-                result = localhostAddr;
-            }
-        }
-        return result;
+        return InetAddress.getByName(Main.pref.get("remote.control.host", LOCALHOST));
     }
 }