This reverts commit 7d82cadd97. I am doing this to buy us some time with respect to issue #106337 w.r.t. the 1.67 release.
7d82cadd97