Get rid of when [1] is merged and backported to yoga
[1] https://review.opendev.org/c/openstack/neutron/+/880621