This reverts commit bd60cd214c, reversing changes made to 74e48a3a8f because it makes limbo_stress hang.
bd60cd214c
74e48a3a8f