Make sure restoration always happen.

cc @senny