Update to not merge-conflict with the Windows patch