ad0a3dd Revert upstream hack that breaks ARC infosys

Authored and Committed by ellert 9 years ago
    Revert upstream hack that breaks ARC infosys
    
        
file added
+12
file modified
+9 -3