This reverts commit 6547ea56f9, reversing changes made to e9e4a34e62. Fixes gh-22039
6547ea56f9
e9e4a34e62