Switch to conduit instead of our own streaming solution