broken with 5d05f7ed "forms: use constructor
feature for form modules" and follow-up misguided clean up

Change-Id: If9447740e6408472722b81d112cd85349020eabe