Yeah... I don't like this either but too many tools are failing at the moment so we have to sort-of monkey-patch them.