Fix the functionality of the restore button

In pairing with David.

Change-Id: I7b4c69a0afd20d25f1ab1bfde63abd29a8984703
Merge "Fix the functionality of the restore button"