[JENKINS-19657]

This should fix issues.