Reverted merge 7e8a50d6c631a9e0849327a01e23a7142c6b45f9 by huybrechts
because of [JENKINS-16766]