This reverts commit c3127249ac, reversing changes made to 11c8b22c5a. See gh-32071
c3127249ac
11c8b22c5a