REBASE
Revert " [1/2] Notifictation counter"

This reverts commit 27692f824987eca45c30483b2eed4bedbcde6c95.