This reverts commit b54ad053f95b343644943705d25a5a6a6b7f852d.
printfix PR Close #19651
Fixes #16127 PR Close #18428