Revert all CM caf stuff.

Change-Id: I17d045dd9ba216cf87acdd47183b3823c24e53fa