Revert https://review.openstack.org/#/c/58533/19

Temporary workaround while we wait for the fix to merge.
Related-Bug: #1295703

Change-Id: Ia6318961e9d246df92527fe65e6e772acc022773