This reverts commit 701116dc9b. Change-Id: I08ad7d55d0c88a9df51ac9d9716ae377a9a5d707 Depends-On: https://review.openstack.org/602092
701116dc9b