Revert "Merge remote-tracking branch 'SpaceMania_GlowStone/master'"

This reverts commit e1dffd14d52e9656b3cdeb22eb44fea520398ef3, reversing
changes made to 346fae63ed006f2b1fcad674204b1258286783c1.