This reverts commit 8624201e0c. This breaks builds like in https://logs.opendev.org/01/673401/2/check/openstacksdk-tox-py36-tips/0e0bed9/job-output.txt.gz#_2019-08-01_17_04_29_549629 Change-Id: Ie4c8f966cfe72828a6ff9a7512948d6c55c62fde
8624201e0c