From c1d08b7b81c7250998d3617187ea3c5c2e908eb3 Mon Sep 17 00:00:00 2001
From: Christy Henriksson <chenriks@microsoft.com>
Date: Mon, 20 Aug 2018 13:10:19 -0700
Subject: [PATCH] Revert email retry (#6290) (#6331)