Fix restore. #9532
Fix broken unit test