Attempt to fix the Windows build after r195799