Revert "Minor change"

This reverts commit 43595fb4a4edc33ca2ed182a4ee93df6f7802e20.
EnumMap