Revert "Protect against generic fields"

This reverts commit c03aa6f14217f8fbcc762b22faeff488b7d750d5.