VIVO-719 Don't use streaming unless required.

At some point we need to find out who is not closing connections.