Revert "[FIXED JENKINS-18629]"

This reverts commit d15c15506e8aaa757983a71c868ed58e0fd48827.