[JENKINS-14515] - Revert erroneous changes in JENKINS-20560 fix

Cause: https://github.com/jenkinsci/customtools-plugin/commit/1ed68b4a65642113f4a61da08aa5f2e4da5d5b4b
The initial fix for JENKINS-20560 caused a regression in JENKINS-14515 (previously fixed in 0.3)

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>