Revert "Merge branch 'master' into chats"

This reverts commit 1f0250758845626eeaebb607a6c6d5b78f0056cb, reversing
changes made to 1917fb3f30482d6f97e902df4774044b031fa18a.
test commit [will be reverted]