Comment 13 for bug 1694666

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