This reverts commit 3f08d248. The commit this change is fixing is being reverted due to GHI #57796 and #37821, so revert this commit as well.