Revert some former chat changes