Removed hardcoded streaming option.