Merge pull request #16199 from dotnet/revert-15944-CorefxTestUseCorrectVersion