SONARPLUGINS-2540 Restore compatibility with older Sonar versions.