Merge "Remove no longer needed http proxy handling code, it's obsolete now"