Rebuild with MailAddress fallback