Yes. It deserves a backport and deprecation, which shouldn't be a problem.