Revert "- BugFix in notifier code."

This reverts commit 583a69195bb76a970b7a68fc3b9f955614b177ed.