Revert "merged"
Revert "merged"

This reverts commit cf57802338d957fd8c5844aa8e5b9e6eff49a396, reversing
changes made to 838fc338b6595e26ca1936cf2af5647cf85bda5c.

somenathghosh/Chat_Client,somenathghosh/Chat_Client,somenathghosh/Chat_Client