Backed out changeset f1a21d8fcdd0 (bug 1076990) for intermittent failures & output not in the normal format; CLOSED TREE