Revert to cm build tools