@limited-terabyte-34878: the known_to_fail stuff is one way to go about this, but in any cases where it is possible to upstream this stuff, that should be our preference