Comment 7 for bug 1570883

github.com/juju/juju/pull/5348

Tested it a bunch of times on the CI machine this time. I was able to repro the failure without this (but less frequently than without my other changes).