Attempt to fix whatever bug is permanently killing the stream again.  Separate stream out to a separate controller.