Revert "updates from caf"

This reverts commit 54cd10357890e3d1802e07c48d232c4fca8753ce.