ENG-6942: Refactor bulk loader to fix deadlock.

I'll change the behavior in my IDE to not do this.