Comment 7 for bug 1595962

Change abandoned by Markus Zoeller (markus_z) (<email address hidden>) on branch: master
Review: https://review.openstack.org/335132
Reason: This is resolved by the revert in https://review.openstack.org/#/c/368732/