Use the new cli, too.