@dannf, this bug seems to be *worse* in xenial than in wily, so I don't think backporting a change from xenial to wily is going to help matters?
@dannf, this bug seems to be *worse* in xenial than in wily, so I don't think backporting a change from xenial to wily is going to help matters?