Try to fix the Windows build after r220637