Comment 17 for bug 1354512

A potential (partial) fix:

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