Revert "AddEncryptionService"

This reverts commit a59e2af81ce143136008aa1fdd2d430467affd66.