d5714d73d4dda1cb2ef39e0e328e328c36b525a2

This reverts commit 333676bd1b
Too many problems were identified during a secondary review.
Change-Id: I6112e6594827a537ac57ccd283b55674506eef20
Description
RETIRED, Gerrit as used by OpenStack