Workaround missing https://review.openstack.org/#/c/68390