Comment 5 for bug 1625579

FYI this change will solve the problem once it's both merged and released: https://review.openstack.org/#/c/364052

That's a part of a larger set of changes, so it solves a whole lot more than this individual problem, but I'll see if it might just make sense to wait for it to be done or if we should go on with what I showed you in IRC.