am 9b1d062b: Make sure we can handle database downgrade (by wiping and starting fresh)

* commit '9b1d062b0f1c4714883444df874e1a078764caa1':
  Make sure we can handle database downgrade (by wiping and starting fresh)