Comment 11 for bug 1017418

I actually think that this issue was fixed in this review:

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

I've made one additional change that could be causing issues and pulled the relevent changes from the other patch into a backport.