Revert "Add Notification and speed up stream restart"

This reverts commit 86476830f8756384857cc39993e19e479fa8fc8c.