Concurrent restoration.

cbugg: close bug-573