This reverts commit 7d1ec43004. This broke the sahara and layer4 dsvm jobs. The layer4 job is voting on tempest changes so tempest is also broken. Change-Id: Ide69f10cd85bf7ff0d86bc8cba56dedd26850362 Partial-Bug: #1573868
7d1ec43004