cherry-picked 74eef45 from master -- cclient is overly verbose...