Revert "Fix a bug where Metacube streams would become inconsistent between different...