Revert "client modifications". forget it!

This reverts commit 1cc8ac0b0f65c89f0840bb334fb06fe64249273a.