Backed out changeset 0f3b26ada540 (bug 926546) for build failures on Windows CLOSED TREE