Revert incomplete changes to HttpConnection