Comment 3 for bug 1628727

I appreciate this is reporoduced on non-xenial rc images, but I think it makes sense to look at this while we're doing the xenial bringup, and then port any fixes found.