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