This reverts commit 2cc6c651ee. The issue was fixed by b955051244. Closes #38163.
2cc6c651ee
b955051244