Revert "Merge pull request #1323 from delanne/IRCContact"

This reverts commit 918e6c0a62ab524f5177f0cb59c127698fc2c04c, reversing
changes made to 38d595befd159d3655bd89c77c9947dc64f12dff.