Comment 2 for bug 1816771

git bisect told me that culprit commit is e8b7e768a2545621ee98511b8dd271c5117f76bd which is https://review.openstack.org/#/c/626561/

I will try to debug a bit how we can fix it. But in case is it would be hard, I will propose revert also