Comment 4 for bug 1818504

Change abandoned by Silvan Kaiser (<email address hidden>) on branch: master
Review: https://review.openstack.org/641277
Reason: @Eric: Reverts are fine with me, thanks for the reverts