This reverts commit 484aee069e, reversing changes made to 6bd7f0231d. See gh-32088
484aee069e
6bd7f0231d