Revert f1ca139 to fix wrong stretch in non-buffered mode