Fix the encrypter to actually use AES encryption by default.
Merge pull request #4030 from ezzatron/aes-encryption

Fix the encrypter to actually use AES encryption by default.