SONARERLNG-16 Restore previous behavior