Replace custom code with m4032404

Not quite stable yet, but when it is, we should use a well test module instead of our custom event listener.