Switch to using cipher.AEAD