Revert recent changes to workshop signup form.
Merge branch 'staging' into test