Merge change 26457 into eclair

* changes:
  Don't restore any setting that we don't think should be backed up