Reverting deadlock work on this branch for a clean PR