There is a commit in branch 6.0 that does this, but this produces heave merge conflicts when rebasing on main after the changes from #2997. So we will add these deprecation removals in the main branch to make it easier for the 6.0 branch to be rebased.
