reverted broken change
working data layer for notification system