am 317b4024: Revert "Make encryption configurable"

* commit '317b4024a2a46b8c57abfa08f2a649df13572bd3':
  Revert "Make encryption configurable"