Revert some changed files from an incorrectly merged commit.

Revert some changed files from an incorrectly merged commit.

Commit 4cf34fe seems to have included some unintentional changes which are
affecting the product. This reverts those files to what they should be.

Commit migrated from https://github.com/dotnet/coreclr/commit/0786c55bf36321a49bb09b5d37a1b2d5f79fd9e9