Revert deadlock-causing change