To upgrade, we need to apply the same changes we have in `main`. If I remember correctly, they were introduced when we moved to subprojects. Not critical, but it will help in keeping 4.3 and 3.3 releases consistent.