Revert 35a271c25bcae8aeb23bcfe48953382ac53d43fc, since this has been applied on the http_improvements branch