Revert "2.23 clientHandler "

This reverts commit 5f802e36d932ee8a7b7389f0f1554e7b64a0e62a.