Refactor encryption to be two step like vanilla. Thanks @LexManos for pointing this out.