Revert "changed argument handling to allow encryption"

This reverts commit e802e6c589db4e48da42f5abd4b19ad8fbd0e479.

I'm undoing this, so I can put it in the crypto branch, and the
later submit a pull request