Revert "Merge remote-tracking branch 'upstream/fomega' into fomega"

This reverts commit 35454260d62d30be2bdeb509e84cf23a1792b45a, reversing
changes made to bbf64630a2495174e7099aaabb4b485085b1178d.
Fixed mistake in Fomega grammar for records and variants