[TEMP] break broken caf guts

Change-Id: I6e1f449e2417efad125d9b7b34ae18c52ff3e48c