diff --git a/lib/urlapi.c b/lib/urlapi.c
index e09ee54be3..96e5d440a5 100644
--- a/lib/urlapi.c
+++ b/lib/urlapi.c
@@ -618,8 +618,7 @@ static CURLUcode ipv6_parse(struct Curl_URL *u, char *hostname,
 }
 
 static CURLUcode hostname_check(struct Curl_URL *u, char *hostname,
-                                size_t hlen, /* length of hostname */
-                                unsigned int flags)
+                                size_t hlen) /* length of hostname */
 {
   size_t len;
   DEBUGASSERT(hostname);
@@ -629,10 +628,8 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname,
   else if(hostname[0] == '[')
     return ipv6_parse(u, hostname, hlen);
   else {
-    static char bad_chars[] = " \r\n\t/:#?!@{}[]\\$\'\"^`*<>=;,+&()%";
-    len = strcspn(hostname, (flags & CURLU_ALLOW_SPACE)
-                            ? &bad_chars[1] /* space is allowed */
-                            : bad_chars);
+    /* letters from the second string are not ok */
+    len = strcspn(hostname, " \r\n\t/:#?!@{}[]\\$\'\"^`*<>=;,+&()%");
     if(hlen != len)
       /* hostname with bad content */
       return CURLUE_BAD_HOSTNAME;
@@ -810,9 +807,8 @@ static CURLUcode parse_authority(struct Curl_URL *u,
     break;
   case HOST_NAME:
     result = urldecode_host(host);
-    if(!result && !(flags & CURLU_NO_AUTHORITY))
-      result = hostname_check(u, Curl_dyn_ptr(host), Curl_dyn_len(host),
-                              flags);
+    if(!result)
+      result = hostname_check(u, Curl_dyn_ptr(host), Curl_dyn_len(host));
     break;
   case HOST_ERROR:
     result = CURLUE_OUT_OF_MEMORY;
@@ -1898,7 +1894,7 @@ nomem:
         /* Skip hostname check, it's allowed to be empty. */
       }
       else {
-        if(!n || hostname_check(u, (char *)newp, n, flags)) {
+        if(!n || hostname_check(u, (char *)newp, n)) {
           free((char *)newp);
           return CURLUE_BAD_HOSTNAME;
         }
diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c
index fe275ebeff..180bea9f2b 100644
--- a/tests/libtest/lib1560.c
+++ b/tests/libtest/lib1560.c
@@ -984,10 +984,6 @@ static const struct redircase set_url_list[] = {
    "../newpage",
    "http://user:foo@example.com/newpage",
    0, 0, CURLUE_OK},
-  {"http://user:foo@example.com/path?query#frag",
-   "http://example org/",
-   "http://example org/",
-   0, CURLU_ALLOW_SPACE, CURLUE_OK},
   {"http://user:foo@example.com/path?query#frag",
    "http://?hi",
    "http:///?hi",