Fix backup/restore SL #4616

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>