Tests are now failing.
This reverts commit 4b6343efc28fb652cc863f881d0cf8690ba0eb1f
Change-Id: I3271b523cca07eaaf1830bc974cb965ce4c161e6
Reviewed-on: https://review.openstack.org/22887
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins