Wip 9887

I haven't tested this with a mixed cluster, but I have run repair_test.py and the test passes.