[JENKINS-16368] Reverted faulty fix.