This reverts commit 5488b8cb46, reversing changes made to dee0df5c53. See gh-25701
5488b8cb46
dee0df5c53