Revert "A better attempt at ensuring test cleanup."

This reverts commit aac4472c56a4978f9855c74b9f298425ba0cd789.