reverting back to email addresses except for new teams.
cc sosubramanian