Revert 84d0685..b6a8133

This rolls back to commit 84d0685d82a1adc20b9c436a9a7ac1a4b89e5f0f.
revert refresh till chat fixed