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