Reverted r1616137, r1616136, r1615900

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1616688 13f79535-47bb-0310-9956-ffa450edef68