Revert "[FIXED JENKINS-7478]"

This reverts commit 285267f0a8e916d1a8b9e04309d4836d86276695.
Revert "[FIXED JENKINS-7478]"

This reverts commit 99162f9519f89b3b48802197068123c20280c161.