Fix Stream refactoring when using xhr-streaming transport