Revert "Fix CCD"

This reverts commit 02e3d570e65171b5105aee4729f4e3addf36a31a.