MT#6703 fix merge conflict

and remove one more class dependency (see MT#6559)