Revert removal of deregisterNotifier