Revert old behavior with respect to new.

So that upload failures don't cause test to hang indefinitely.