Revert "cipher"

This reverts commit 576477fc633512ac93e5da1942783fea873b3558.