Updated build system (thanks Pahimar!)
Remving workaround code (bug fixed on Forge build 1034)