Revert "Merge branch 'require-email'"

This reverts commit e209d8c9dd72c9d971b772c6932d58b1d000ae7c, reversing
changes made to c0f8c95ea6c1d561aca4d056ebaa5bfcccf47c23.