re-apply a commit dropped in this branch due to conflicts

This commit reapplies 4f0aa7d639e099b18df583cb984412037fbb1dbe.
1a492d5156Andrew Kelley committed on 9/2/2021, 12:54:07 AMparent5a4cc24
3 files changedLine totals unavailable