closes gh-23675

Comment From: snicoll

@samratdhillon thanks for the PR and sorry it took so long to process it. I believe this has been addressed in the meantime by #25681.