Modification of regular client/server

uniformity.
Revert "Modification of regular client/server"

This reverts commit 9dea161c820b84d207b70a134a0e5d0c58c4d61e.
Changed for uniformity

Now this client acts more as expected.