Here's the updated patch with just the instream change.