Comment 7 for bug 1493442

Change abandoned by Dan Prince (<email address hidden>) on branch: master
Review: https://review.openstack.org/221411