Revert Glowstone changes, it now has its own branch