revert patches from cm