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