Sounds like we'll need to change the way we're creating the EncryptedDatum() in encrypt then too?