Revert #43460 and #40884 (#44175)#44177

Merged

DanielRosenwasser merged 1 commit intomicrosoft:release-4.3from

jessetrinity:pick44175

May 20, 2021

Commits on May 20, 2021

Revert #43460 and #40884 (#44175)

Jesse Trinity
authored and
jessetrinity
committed