Changing back to repackaged httpclient