This one is failing on a tsan test. I don’t think my change caused it, but feel free to revert in case it did.