Issue #2241827 follow-up by tim.plunkett, sun: Switch from form builder to new form validator.