Make sure we wait for undo import completion before proceeding.

Caused intermittent failures