This reverts commit ba0ef11b6b, reversing changes made to d380ada4b2. See gh-42389
ba0ef11b6b
d380ada4b2