This reverts 3e06000fd98fbf3095c43f695e14643dbe7f9302

The work around this was made for is no longer needed as CraftBukkit now properly calls the event