Reverted enum values to fix UT regression