Comment 2 for bug 1253993

FIY: I am accruing fixes for this bug in review.openstack.org/57420