SONAR-4475 Revert commit 3554f0dddf that makes tests fail