diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 06670b8d48f..6665c93caf5 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -269,8 +269,11 @@ of which this module provides three different variants:
 
    .. method:: address_string()
 
-      Returns the client address, formatted for logging. A name lookup is
-      performed on the client's IP address.
+      Returns the client address.
+
+      .. versionchanged:: 3.3
+         Previously, a name lookup was performed. To avoid name resolution
+         delays, it now always returns the IP address.
 
 
 .. class:: SimpleHTTPRequestHandler(request, client_address, server)
diff --git a/Lib/http/server.py b/Lib/http/server.py
index 18313cffad5..b6b2997fbf7 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -558,15 +558,9 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
                  'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
 
     def address_string(self):
-        """Return the client address formatted for logging.
+        """Return the client address."""
 
-        This version looks up the full hostname using gethostbyaddr(),
-        and tries to find a name that contains at least one dot.
-
-        """
-
-        host, port = self.client_address[:2]
-        return socket.getfqdn(host)
+        return self.client_address[0]
 
     # Essentially static class variables
 
@@ -1040,9 +1034,6 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
         env['SCRIPT_NAME'] = scriptname
         if query:
             env['QUERY_STRING'] = query
-        host = self.address_string()
-        if host != self.client_address[0]:
-            env['REMOTE_HOST'] = host
         env['REMOTE_ADDR'] = self.client_address[0]
         authorization = self.headers.get("authorization")
         if authorization:
diff --git a/Misc/NEWS b/Misc/NEWS
index 3b5cbda26de..83f2e3ea04e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the
+  client ip address instead client hostname. Patch by Charles-François Natali.
+
 - Issue #14309: Deprecate time.clock(), use time.perf_counter() or
   time.process_time() instead.