Revert some stuffs to CM