b527505338
This turned out to break a lot of things in the engine unexpectedly. The actual deadlock that this fixes seems rare so a better approach is needed. For 4.7 we should drop this one. This reverts commitae564feb2a. This reverts commit7ab8328204.