Revert "Fixed up changes to CaseId and FlagReason"

This reverts commit 4196e279f97e0c2e6ab37cfde30008e5a003424b.