Revert "Remove client part"

This reverts commit 60adea53e9d31db271866decf2ead3adc031203a.