Revert "Issue #2459753 by tim.plunkett: EntityForm::validate() should be able to modify the form structure" This reverts commit d4d83576.