Backed out ce5e6bbaa1a7 - Breaks streaming for some reason
Backed out ce5e6bbaa1a7 - Breaks streaming for some reason

eriol/circuits,treemo/circuits,eriol/circuits,eriol/circuits,treemo/circuits,treemo/circuits,nizox/circuits