Closes gh-28444

Comment From: snicoll

Closed by 05fa0e246a