Tweak r58117: removed diff-multi class