[JENKINS-17667] Reverting commit e3952f41c5649c326ace3cc263420a8c287e1e7c.