This reverts commit 528da64a. The commit is a bad way to fix #19838, and introduces #21593. Fixes #21593.