This reverts commit e59439af.

This is causing unexpected failures in some test ways. Further proof
that no change is too trivial for CI.