This would match the PRs that we eventually upstream, and would capture the tests that are failing/misbehaving without compact headers better. This would require enabling `UCOH` for testing explicitly.