SONAR-5753 Revert change on ComponentMapper