Revert "Fix up issue with ServletOutputStream"

This reverts commit cff34ce0029d985573b52135982723467f4070c7.