Revert "[FIXED JENKINS-17769], [FIXED JENKINS-17915],"

This reverts commit c62d40de6ab6c4dbcbb480fcb0645c8b633f5a4b.