38ce1c Revert last four commits

Authored and Committed by zbyszek 4 years ago
    Revert last four commits
    
    Pushed by mistake too early :(
    
        
file removed
-105
file modified
+29 -145