Change User.email to User.emails (upstream change)