Revert "Merge pull request #215 from JBou/master"
Revert "Merge pull request #215 from JBou/master"

This reverts commit 5df916cb500d47fa3ef5a5701304bab08f4f1352, reversing
changes made to 757ef4f7fd7c80a5fbd9eb9ce9d2592cee769d6d.

icedream/Craft.Net,SirCmpwn/Craft.Net,darkcrash/Craft.Net,Geptun/Chuckle.net,samuto/Craft.Net