The upstream commits for these are now finalised, so we shouldn't need to replace patches after this (but might need to add more).