Back out Bug 788613 for breaking the build on Windows.