As a package maintained upstream in git, use the same logic in the git