Revert both own r60700 and r60702. API behavior for expanded enums is completly inconsistent, but again, better to do such changes (soft-breaking API) in bulk...

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@60705 954f8c5b-7b00-dc11-b283-0030488c597c