Revert "FINALLY remove channel enums"

This reverts commit b571b8286b90ce0694e9093007ac3d976dbd39b6.