Revert "Merge branch 'CECommunity'"

This reverts commit c58b08294aeff599c31e899a9f013ed322039e45, reversing
changes made to c14a482042f9b6f1bc4d34394ec5a0b96a2e4880.