This reverts commit 8b32dcad. Breaks opening more common URL-encoded links (see bug #621721). Will take a closer look at the test case in bug #581032.