Ravis upstream change

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