When doing some (intense) testing I've seen it crash. This will prevent it for good. (cherry picked from commit a20a4327)