Revert "updates from caf"

This reverts commit ede7353cb7ee0031f7506a8ae6abd0e0d10971dc.