Backed out changeset c0fcfbab6ff1 / port of bug 718391 due to build bustage on CLOSED TREE