Signed-off-by: Darren Stahl <darst@microsoft.com> (cherry picked from commit 3f13107223a9753d709c196c46f1c846041fc0c3)