Revert "CRM-14532 add better teardown"

This reverts commit 7b167a0045f4bf22f472c1674dca4f8744086917.