am 2cf180f6: Merge "Separate uncrypt into two modes"

* commit '2cf180f6cc3275592f82a57ab98b72723937e0fb':
  Separate uncrypt into two modes