This reverts commit a1ec7669f6, reversing changes made to e27192e8ad. See gh-33366
a1ec7669f6
e27192e8ad