This reverts commit 72b8a6ca05, b820d9feac, and edadf816ab. See gh-49620
72b8a6ca05
b820d9feac
edadf816ab