This is a backport for PR 7443.

Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
(cherry picked from commit af3a0214)