Backout b131b1f08ffc for oranges on a CLOSED TREE
Backout d5720a99657f for oranges on a CLOSED TREE