Revert "encryption branch merge"

This reverts commit d1c2b8a903a0600e7efe2e68ba574777dc18d911.
revert last commit