Revert e9d83bc..8e425a7

This rolls back to commit e9d83bc9637ad78971c6f11ee09dc33258402b90.
working on chat