Merge "Remove --no-stream from script."