Revert part of CAF Merge