Per discussion on #openstack-infra.
This reverts commit 63652f148e006808b35c4f39490cc8a74fa81128
Change-Id: I018a8d99f450cc65eeaae0d4de4efa89cb455543
Reviewed-on: https://review.openstack.org/18784
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins