Go back to old behavior and let the context end the stream