This reverts commit c279792130. This commit inadvertently removed all of the non-staff email logic, rather than just for the 'test email' button. https://meta.discourse.org/t/112231/5
c279792130