Streamserver: follow up on eed6a46