Merge change 6783

* changes:
  turn restore back in in eclair