Bug 1014977 - Backout suite portion of http://hg.mozilla.org/comm-central/rev/0943558ecc1f. r=bustagefix