Backed out changeset 7809455a72a7 (bug 970252) for build bustage on a CLOSED TREE