Backout changeset 6a6ba49340e7 (bug 837039) for M1 orange on a CLOSED TREE.