Revert "Merge branch 'issue/block-traits-field-traits' into 'master'"
This reverts merge request !564 (merged)
Due to issues that came up with the FieldTraits implementation, we cannot easily use it as a replacement for BlockTraits. This needs further investigation.