Little revert on some CLI stuff