[FIXED JENKINS-18543] Revert break from commit 11525049ed173f941d6ec6e87...

...694269ef40d9920