bca1a930f4
This reverts commit 5032dbc8074d5133c6b71610cd57d3c8da07c9b9 based on [1]. [1] https://review.openstack.org/#/c/274703/ Change-Id: Ic10ef7c37d71e452fbc4bd36e28be79d669b4e3f