Done. https://review.openstack.org/#/c/55301/