Backout c3268996719e (bug 828607) for bustage on a CLOSED TREE