This reverts commit eaa510872a, reversing changes made to 3e69522e2d. See gh-25700
eaa510872a
3e69522e2d