This reverts commit a1cd79a2b483a09f58fa9f6286b589bb759d391d.
Due to the merge policy mentioned in https://github.com/dotnet/arcade/pull/14868#issuecomment-2182140553, which limits a single pull request to a single change, this pull request is unable to contain the fixes from #14868 that will instead be submitted as follow-up changes after this merges.
This reverts commit a1cd79a2b483a09f58fa9f6286b589bb759d391d.
Due to the merge policy mentioned in https://github.com/dotnet/arcade/pull/14868#issuecomment-2182140553, which limits a single pull request to a single change, this pull request is unable to contain the fixes from #14868 that will instead be submitted as follow-up changes after this merges.