[FIXED JENKINS-22080] Braindead logic in author of original fix... corrected by same author