Use the original stream id when rehydrating a snapshot. Fixes #349