Comment 2 for bug 1081836

Thanks for find this nasty issue

This is the commit which introduced the regression: https://review.openstack.org/16432

It's a backport of this: https://review.openstack.org/14991

However, the latter fix was only required to fix an issue with this fix on master: https://review.openstack.org/14068

This is now being backported too: https://review.openstack.org/#/c/16713/

Which means the original backport causing this regression will still be needed and we just need to fix it.