Revert "[Client] Modification"

This reverts commit 543532cb012cff4368bfad32aa0e48df4a80ffe9.