[TEMP] break broken caf guts

Change-Id: I64a9b1df03f6817e988ea49eece9549210605c57