Backed out changeset e3b5dca30ade (bug 907743) for build failure on Windows on a CLOSED TREE