Migrate to use CD raw.