rmdemux: resurrect some flow return handling