This reverts commit 176f15cd48.
Puppet and zuul aren't ready for this. The swift client throws an
exception. We need to restart zuul to fix a more pressing issue hence
this revert. Will debug when able to.
Change-Id: Ie4487d84b7f1495c7ec6fd31e4b5b90d6699a31d