Revert "A few fixes to escape control codes from IRC land"