Reverting to old streams till I fix this