This reverts commit be6f34c3388365f93c84671f07af7a1cffb6efd8
Now that the openstack/nova commit
3c217acb9c55d647ca362320d697e80d7cfa5ceb has landed. The issue is now
fixed and we can revert this change.
Change-Id: I6729706b13d49a277a2f037ea7ef00211d4a4ca9
Related-Bug: #1651678