Comment 18 for bug 1349774

Change abandoned by Derek Higgins (<email address hidden>) on branch: master
Review: https://review.openstack.org/110258