Yeah, unfortunately it's less about speed and more about CI resources (which without the infinite scalability of blaze we hit regularly).  I think there's value in the downstream variety because it tests header coalescing, but for upstream I don't see the value so I'd still prefer to avoid adding one more straw on the metaphorical CI-camel's back.