Revert workaround for missing event handlers.