This reverts commit 586ce00e06, reversing changes made to 563b8a8cec. See gh-25839
586ce00e06
563b8a8cec