82936cd43e
This reverts commit d1b79539c4b3526fde6361f774a948cee7c8da59. This commit was breaking devstack-gate for stable/grizzly changes. Change-Id: I6b138d7ed5f8ad0362801b569dd46834d41b4cf7