This reverts commit b69a11e3b4ba830965c47e695245336fb987a411
Change-Id: Ie33859cb0a51e2843851ecf18a7d907afee4b42a
Reviewed-on: https://review.openstack.org/12435
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: James E. Blair <corvus@inaugust.com>