Rollback for some crucial fixes
Merge branch 'master' of https://github.com/Soulwax88/Dittany