This reverts commit 5e21f475.

The solution implemented was not equivalent and resulted in issues
for users with proxies.

Fixes #1458