Backed out changeset 7e243174acf5 (bug 964545) to fix a CLOSED TREE