removed cherry pick for https://review.openstack.org/#/c/125354/
as it has merged upstream.