Temporarily revert JAVA-505 and JAVA-518.

We are delaying these tickets to 2.0.10 to speed up the release of
2.0.9, which fixes critical bugs.
Rework connection reaper to avoid deadlock (JAVA-556).
Avoid deadlock when multiple connections to the same host get write errors (JAVA-557).