Revert "Rough stab at removing event listeners on shutdown"

This reverts commit da71fb69602b28faad3bf75c719b98cab1d0e991.

Also didn't work.  :'(