Fixes #23070

Comment From: anshlykov

@snicoll Thanks for your feedback. I'll make the changes today or tomorrow

Comment From: snicoll

@anshlykov thanks for the follow-up. This is now merged in master with a polish commit.