Merge "Remove FieldHelper."