Backed out changeset edbc72909115 (bug 1037100) for build bustage on a CLOSED TREE