In all the code below, streaming is never `True`.  Do we need this branch?