Removed hack which replaced enums with int

After some testing it seems that this is not needed anymore.
It might had been related to a wrong element order in the output which is
fixed for some time.