Backed out changeset bdff1219fc1f (bug 927672) for Windows bustage. DONTBUILD