Revert back to single file-handler per stream.