Revert "Added some defaults for encryption"

This reverts commit 2446913ccdb9f7e8a3a19b81e8002ff1d71a1bce.