This should make the scripts more robust.
Let's make sure what is now documented as fix for #17740 is not accidentally changed anymore.