Revert "Switch statement fixed again."

This reverts commit a853717ad16cb73b6f084d2f8213bb744d1701f2.