Get rid of Apache Client 3 provider, close #719