Revert "work around unittest failure"

This reverts commit 061f407dfb540c9b740b25a3490f16608b639c77.
check Client status when doing connect