This reverts commit 9d1f9f0e. Follow-up #6477 NO_DOC=ci NO_TEST=ci NO_CHANGELOG=ci (cherry picked from commit 7e1df16e)