1515938 Revert two patches from upstream, breaking some archs.

Authored and Committed by terjeros 5 years ago
    Revert two patches from upstream, breaking some archs.
    See issue #1164 upstream.
    
        
file added
+592
file added
+152
file modified
+5 -0