This reverts commit a37e8b275d / #21451 Temporarily revert this PR to be able to continue discussion, and potentially get it into 1.19.0
a37e8b275d