Revert SONARPLUGINS-2709