Revert "CipherUtil"

This reverts commit 523a811f9f65f138d5209d5cfe9d09388c2d2df3.
Revert "Revert "CipherUtil""

This reverts commit 3d99fb86506ce465a71b896786f2ec973f2c21b2.