Closed
Description
Details here: #21936 (comment); pulled out as a separate issue so that we can discuss the changes and reference it in a pull request.
Details here: #21936 (comment); pulled out as a separate issue so that we can discuss the changes and reference it in a pull request.