Revert workaround after ccm patch.