f2ba2d9146
This reverts commit e7dd96c742b813790dd4587b2a964ab4ba6a0d6a. Change-Id: I295464f3bdf7ac41a642e13f0dabba00e7e51e80 Reviewed-on: https://review.openstack.org/25836 Reviewed-by: Anita Kuno <akuno@lavabit.com> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: Clark Boylan <clark.boylan@gmail.com> Tested-by: Jenkins