Fix for JENKINS-19742.
Fix for JENKINS-19742.