Unreviewed attempt to fix the Windows build after r230721