the one conflicting change after commons cleanup and httpclient removal from commons.