Backout ad781d8dcdc6 (bug 878411) because of massive test bustage on a CLOSED TREE