This is being reverted in: https://review.openstack.org/#/c/304917/
It must be resubmitted so that it does not cause intermittent bug 1569507
This is being reverted in: https:/ /review. openstack. org/#/c/ 304917/
It must be resubmitted so that it does not cause intermittent bug 1569507