Hopefully tdf#90391 will be solved, else we'll have to revert all MatOp
work and do this change on the previous code.

Change-Id: I4789ccf389558f3687d90c600a4f1a27c24a20d9