Revert commit 10fb9bc32d9e56cae6d7e6150759679f5766f8ab due to SONAR-4808