Addresses #23

r? @ericz 

I think it's safe to assume no one will be XHR-streaming only if they're relying on this.