Right. But keeping the two aligned will allow us to remove the ad-hoc initialization logic from our side once we drop 2.10 support.