Revert "Client"

This reverts commit fcfd425dd27e7d0f4028f96b7a98cdfc9136ad09.
Revert "Revert "Client""

This reverts commit 55807c2c9f509208010aff18931a1f8dd8749acd.