1255a76bf3
This reverts commit 7f097049b879f7ddf2f751617fd1a904bb5b3760. Had build errors, probably 'cause i'm using an old version of Java in my build env.