revert streams pending circular fix