Revert "cpe 2.3 edits"

This reverts commit 1f57d922a4946c33072394b6f5d9b4137ebe685f.