I think instead of maintaining distribution-specific patches forever, it’s a bit easier to have them applied upstream, especially since they don’t break anything. fixes #876