Revert "merge ck patchset"

This reverts commit 1c8aa115fb69556b5df15513c48264612baf8956.