Revert "Testing caf-new branches"

This reverts commit b735935113e7110b759a1e360db03ae74888d823.