This reverts commit d86160d362, reversing changes made to 70d2907351. See gh-42388
d86160d362
70d2907351