Trustingly add Thorston's deadlock patch