Unreviewed revert Fujii's revert in r237214 with new WinCairo build fix.