Revert "Merge branch 'fix/tablet-group-chat-1477' into 'master'"

This reverts merge request !498 (merged)

Reverts #1477 (closed) fix attempt which needs to be readdressed