Apply Reed's deadlocking fix (manually applied)