am 38394c7d: am 223fd1ca: Revert "Make encryption configurable"

* commit '38394c7d2d6d5bd8c7467155587a78b912e2b7ab':
  Revert "Make encryption configurable"