Backed out changeset 2f6f548cd175 (bug 987995) for bustage on a CLOSED TREE