Comment 13 for bug 1378904

Change abandoned by Andrey Volkov (<email address hidden>) on branch: master
Review: https://review.openstack.org/509206