* commit '4a534fa899e0101e26e5b670383aa357c10483b8': Revert "Remove the APIs for the old encryption scheme."