This reverts commit 2b48fcc607010065c0f8107baf669dd41b164f3c. It introduced a regression (#20777) which we can't easily fix in 1.6.
This reverts commit 2b48fcc607010065c0f8107baf669dd41b164f3c. It introduced a regression (#20777) which we can't easily fix in 1.6.