Revert "merge 2.7-stable branch from caf"

This reverts commit 5921bcd8258fbc4018ffde03354445fae93f689d.