Fixing https://github.com/andresriancho/w3af/issues/1917 in a better way, which doesn't break test_xurllib.py