This commit reverts 6d37ae95edc06f15e4e77f64e8e637dd5d269183 and
8f8294a809f9d975735377e7bfcc2c47ccfc4cb7. I don't know why they caused a
failure but that investigation can happen while the CI is green.
dc9d76b630Andrew Kelley committed on 9/16/2021, 11:40:06 PMparentd11f42c