Revert "reworking core enums so they are castable and don't require manual mapping"

This reverts commit db5fc409750f151f896357704f0fec76ae80e48f.