Backout ed7130b21a68 (Bug 957723) for SM(r) orange on a CLOSED TREE.