Revert to cm default with skz additions