CraftBukkit has added this patch, so we can remove it.