Merge "Revert CC related changes."