Comment 4 for bug 1496932

Change abandoned by Alexis Lee (<email address hidden>) on branch: master
Review: https://review.openstack.org/347750