Revert extra-field-error checking