Backed out changeset 675ea8aeb804 (bug 884897) for breaking builds on a CLOSED TREE