Backout 01aec9db40d9 for bustage on a CLOSED TREE