Closes gh-27910

Comment From: rstoyanchev

Thanks for the suggestion and pull request.

Comment From: heowc

Thanks for the quick check 😁

Comment From: rstoyanchev

Note that this has been reverted in 6.0. See discussion under #28455 for details.