Fixed dependencies, restore old DefaultHttpClient.