reapply Jason's change for add DELETE for forms 5a3673ecd654b7546583ec37...

...3005bb19dd4343f9