Revert "changes to client info"

This reverts commit 981a4b0983f11609b6e5c3c053a85ad5cd8c82a0.
Revert "Revert "changes to client info""

This reverts commit ecf15e327a17708a341fe5fd12c03e8a4ce3dd18.