[FIXED JENKINS-22080] Braindead logic in author of original fix... corrected by same author
Merge pull request #1151 from stephenc/master

[FIXED JENKINS-22080] Braindead logic in author of original fix... corre...