Make it work with recent cli changes.