Update to 88e40c7081b9bf8a337022ad2f12efe485fa8021
    
    Backporting just the fixes for
    https://bugzilla.redhat.com/show_bug.cgi?id=1813529 is bound to cause
    more trouble than it’s worth, so we’re going all out.