- #3751: Fix potential overriding of cipher by other libraries