Backed out changeset a876f43914f6 (bug 921919) for build failures on a CLOSED TREE