Back out bug 877584 on this CLOSED TREE.