Revert now unnecessary exposure of client to derived CLI classes