So I guess you could say we're in some in-between state, but I don't
think it's inconsistent. It just allows us to do this step by step,
which I think is good.
Well, I am still not super happy, but it fixes a regression, so I will
keep it in for-next.
