Comment 3 for bug 1735171

https://review.openstack.org/524147 tries to re-introduce current-pike.