Revert "Merge pull request #2961 from dimagi/delete-form-race-condition"

This reverts commit bab89b8d23c1fab8a51a9f659b671b62c326dc6c, reversing
changes made to 6b575bdc0513490eeda1ea9bc163a99ed32e75fe.
Merge pull request #2982 from dimagi/revert-bab89b8

Revert "Merge pull request #2961 from dimagi/delete-form-race-condition"