Reduce code because of upstream go-cli changes