Wip 7810

This is triggering MDS crash #9173
Ah, that's sort of irritating, but okay.