Revert pr #655

Notifier changes are causing NATS issues.

Will be merged back when a fix is ready.

This reverts commit f84c6bc38ec31e3d955641afbcd6d3056fd8917c.