Backout e7e4224b8c8d (bug 829421) for bustage on a CLOSED TREE