Comment 1 for bug 1498608

I have proposed https://review.openstack.org/#/c/226475/ to remedy this issue.