dc9275 revert upstream commits that introduced SIGSEGV crashes

Authored and Committed by decathorpe 2 months ago
    revert upstream commits that introduced SIGSEGV crashes
    
        
file modified
+7 -1