Reinstating fault logic lost in the merge.