Revert SONAR-4045