Backed out changeset 8c69c6e6fc39 (bug 942633) for build failures on a CLOSED TREE