Temporary fix for streaming integration tests.  They pass now but streaming is still on life support, See AMP-109.