Revert "CEC re-patch"

This reverts commit 27a48e8f7b69bd3364e95e4b1e10401524b0aee7.