Reverting enum changes because it was not necessary