Should we handle this case through notifications too, to keep parity with the registration for push notifications?