Trying to avoid triggering JENKINS-24358 deadlock.