Newer versions of the helper scripts upstream