Fix in the f2e34dbb got partially reverted by introduction of AbstractNotificationsModel in 2357e6f2.