Restore the first implementation by Jimx-, which was actually correct
Merge branch 'master' of git://github.com/avelanarius/Minecraft