This should no longer be necessary with the new Cilantro notifications.