test-asan is failing on v14.x. I suspect it is due to this commit - I'm raising this PR to initially just test whether this commit is the cause of the failure (I'm having trouble running test-asan locally).

The original PR passed test-asan, so I suspect if this commit is the cause, it would be due to a related commit missing on v14.x.

This reverts commit 70e77f123164ecbdbdd4abc2e4919ce1b193421e.

Checklist

• make -j4 test (UNIX), or vcbuild test (Windows) passes
• commit message follows commit guidelines