This reverts commit 9712a7a1, reversing
changes made to 3e65c3d3.

Reverting because this caused test failures and while we have a followup
branch there is still one failure that happens randomly and isn't
straight forward to fix.