Bug 864230 - Fix output buffer starvation