Code review comment for lp://staging/~dpniel/ubiquity/fix-1479064

Now that I've actually managed to test this correctly, it appears to work. I'll continue testing the other branches as well, but this one looks good to me.