SSLR-304 Restore behavioural compatibility