ENG-7050: Use enumset without the spec changes.