I'll temporarily close this PR and try to do it more carefully, or just skip this test matrix.