Split on model values when repaired model from non-linear is inconsisent (#3668)