Revert a few changes to the chat module

I don't care if it taints, only seeing timestamp on half of all lines in the chat triggers my OCD. I can live with the taint!