Revert to CM build