Revert for cm-10.2