Revert BC breaking changes, useing formOptions instead