Fix deferred encryption/decryption parameters (#6500).