Revert SONARVS-58