#17488 - keep output buffering on