Comment 3 for bug 1609020

Here's a fix from Thomas which fell under the radar upstream and didn't get merged:

https://review.openstack.org/#/c/350778

Marius hit this problem when testing Newton, assigning the rc2 milestone, and also mitaka-backport-potential.