diff --git a/libs/sofia-sip/libsofia-sip-ua/url/url.c b/libs/sofia-sip/libsofia-sip-ua/url/url.c
index 61baa83d3b..9960f9f5b1 100644
--- a/libs/sofia-sip/libsofia-sip-ua/url/url.c
+++ b/libs/sofia-sip/libsofia-sip-ua/url/url.c
@@ -592,23 +592,12 @@ int _url_d(url_t *url, char *s)
 
   if (url->url_type == url_sip || url->url_type == url_sips) {
     /* SIP URL may have /; in user part */
-#if 1
 	n = strcspn(s, "@#");   /* Opaque part */
 	if ((p = strcspn(s, "#")) == n) {
 	  n = strcspn(s, "@");
       if (s[n] != '@')
         n = 0;
 	}
-#else
-    n = strcspn(s, "@");/* Opaque part */
-    if (n == strlen(s)) {
-        if ((strchr(s, '#')))
-            n = 0;
-    } else {
-        if (strchr(s + n, '#'))
-            n = 0;
-    }
-#endif
     n += strcspn(s + n, "/;?#");
   }
   else if (url->url_type == url_wv) {