am 8e55eac9: Bring the test transport\'s restore code into line

Merge commit '8e55eac96d768a4de68a091f57487deadf6d0a87'

* commit '8e55eac96d768a4de68a091f57487deadf6d0a87':
  Bring the test transport's restore code into line