Revert "updates from caf"

This reverts commit a79258aeff5a6aa81b4a4ff02ee36b94224bc3f7.