Revert SONAR-4950