This reverts commit 7b07072a8e037cba571423e83becd97fe0757fb3. Conflicts: file/lib/util/ChatUtil.class.php