Give using the CM versions of vendor/cm and such a go.