Revert last 2 patches
"Allow a slave to 'late join' another splitpoint"