Re-committing the non-broken stuff from previous revert of previous
commit on form model.  :)