Backed out changesets d864c70c64c9 and e4d7f9580e5a (bug 883953) for mochitest-mc orange.