A fresh attempt to fix jenkins race condition