Revert "CET Cleanup 5/23"

This reverts commit 56efc168d624dbd393d99c11550264af19b29185.