b5f29853ff
This reverts commit a1ec856e61532daa49f38683857918fd2cc561aa. This change didn't actually solve the problem so it's best not to continue to carry it. The correct fix is for the issue is https://review.openstack.org/547281. Change-Id: I4e6c5f8a1189d7a134c99b45505e7d33df5c6d89