Revert "Drop redundant Case fields #1300"

This reverts commit 0a21a761fda798bcf112e5d25613f7d92a10682e.