Revert "Merge remote-tracking branch 'stevangoode/JOINDIN-154' into edit-event-form"

This reverts commit 1c6c0f26e12ce1704574b3377541688c5a482b50, reversing
changes made to 989edccfe45b8c312ee3cb4dc20e9b21de7b3bab.