Revert "Update ClientHandler.java"

This reverts commit cb33ba225af2ec8222d69d4a89a15ce7dda0fceb.
Revert "Update ServerHandler.java"

This reverts commit 45f401dede4796acc12ff68e7add321a2cf07837.