Revert to non-buffered operation due to issues with some server