Revert "Revert "Revert "Fix the master branch for IRC"""

This reverts commit 5f3aadce5ad0ac4abf056b10ba2bf0d524c12f39.