Revert "Fixing warning caused by default statement in switch statement that covered all enumeration values"

This reverts commit b5c48f13a1d42952da78ab3027b7d804048f525b.