This reverts commit 7b375fcb82. Reapplies 4a38520d59 with a fix for #66202 Fixes #66202
7b375fcb82
4a38520d59