FWIW I believe the existing check is just what the old CLI does already.