Rewrite to match current form helpers interface