Patching  https://review.openstack.org/#/c/70182/