Revert "Merge pull request #1107 from Gozala/bug/zombie-test@893249" for causing near-permanent Ubuntu debug timeouts.

This reverts commit 4d783655b311a5d1450436f4c9a22e0bd16f2dd0, reversing
changes made to 688f6b03f12f3ca2e61d143e0e5454c3c3775c0f.