Revert go-flags fork import