Backed out changeset eb46f1ed8c8c (bug 897113) for mochitest-mc failures.