Revert "Merge pull request #294104 from microsoft/tyriar/revert"

This reverts commit a8f61833a363b30e231ac4455a0de1d3ab23fb78, reversing
changes made to 7e883bb39849880de7e865720ba34e649cb6a0ca.