Revert "Merge pull request #271 from AndreiH/notification"

This reverts commit 9dd68a4cdc6d2b9f17fb2568045a87a93b13c1ec, reversing
changes made to c9757412706c7ffad7d7000236907f0ce22158e2.