Merge change 8412

* changes:
  Revert "Have the notification service only have notifications diabled"