Removed: Lame workaround for Bukkit-2974 (seems like it was fixed)