Rolled back changes that conflicted with createEmailViewModel().