This reverts commit 97b26b4886, reversing changes made to 6f9b1ed6a3. See gh-25840
97b26b4886
6f9b1ed6a3