Unreviewed, fix the Windows build after r223031