Restore unbuffered functionality as option