Revert "ECMS-5428 fix the build failure problem on xCMIS master"

This reverts commit 17bcf756423e7d437da6caefd199e533070b1ff9.