Comment 15 for bug 1457527

There was some controversy around this fix, as it broke the triple-o CI:

https://review.openstack.org/#/c/190622/

That was abandoned since triple-o worked around the issue themselves, but it does make me nervous about backporting a potentially breaking change into a stable branch.