This reverts commit f8605da8. This is causing buildbot failures and now I see that I have not updated the tests to use "stop" instead of "trap".