Revert "Clean up CoreException"

This reverts commit 1e8389b27ff99ad9f48c890486ebef936acafc41.