Comment 15 for bug 1656664

Since quite a lot of time has passed, I somewhat took advantage of #5: The solution is relatively simle compared to the suggestion, and IMO still solves the original problem without harming other uses of worker class too much (branch linked to ticket).