0b9c9dbce7
This reverts commit 4e8a3ca6b2041c170f4073499ee0315616396af2. This is handled generically with this change and its dependency: https://review.openstack.org/#/c/606853/ Change-Id: Ic79cc07a2d11772c1892b2db8c4c02cc7be4081c