SSLR-304 Restore binary compatibility