Unreviewed attempt to fix the Windows build after r237112.