Removed bad fix for event binding