This reverts commit 33830978. Follow-up #6477 NO_DOC=ci NO_TEST=ci NO_CHANGELOG=ci (cherry picked from commit 6605de25)