Revert the last commit
Test streaming client in presence of non-contiguous zone/node ids