Revert to CM build tools