This reverts commit c2ad7c23 while adding the handling for the new enum value into the switch statement.