Comment 37 for bug 1357578

Change abandoned by Sean Dague (<email address hidden>) on branch: master
Review: https://review.openstack.org/123426