Partially revert 37b8d549d610c

That patch introduced a bug where the list of dynamic fields for a form is
always empty
Merge pull request #1004 from greezybacon/issue/979

Partially revert 37b8d549d610c

Reviewed-By: Peter Rotich <peter@osticket.com>