Revert "[TEMP] break broken caf guts"

WHO PUT THIS HERE?! oh yeah... lulul

This reverts commit e6a63b04075702256cb11cba73cab333489456b0.

Change-Id: I08e0f99f0111fd8e0ab60826c583ff1ea319be46