Revert "Merge branch 'master' of https://github.com/YeDie/yochat"

This reverts commit 5c8afae740e818dffb2b65651e862d7ca6af8710, reversing
changes made to 0d46a9e961be82306ba399be650e4c472d340d5b.