Revert "No CAF anymore"

This reverts commit 3766ca85ac4f4e68f836d88208c6dd04b00cf954.