This reverts commit 0014c0c373. This is handled generically now with this change and its dependency: https://review.openstack.org/#/c/606853/ Change-Id: I360211cf60afb5611fb9e77fe6332fa59159708f
0014c0c373