Fixes gh-33666

Comment From: simonbasle

Thanks for the PR, but I'm already on it (as indicated by the issue being assigned to me).