Restore ts more robustly