Fix Previous Commit
Disable Deadlock Detection/Resolution

We don't need it for our project.