Revert how notifications are handled, avoid service being killed