Revert r83812 (schema change for cl_type enum), no longer needed after r84392. Also...