moved back to streaming API as this is more stable.