Comment 9 for bug 1694847

It's almost certainly https://review.openstack.org/#/c/464183 that broke this. I'm trying to figure out how that passed the updates job on the review because it seems to me that it shouldn't have. Maybe there's another change that combined with this one messed things up.