Unchained: Reverted last patch

Last patch introduced a breaking change in chat. We had to revert it :(