am 80a8786e: Merge "Revert "Save config to disk to avoid binding."" into mnc-dev

* commit '80a8786ebe16c9ee0916f7915c321529c0ee8292':
  Revert "Save config to disk to avoid binding."