Revert "Implement ck1 patchset, fixed build with it"

This reverts commit 9ff878321330bb10c8d76cc74ff15bfaf08a995e.