EZP-22477: Make sure legacy kernel handlers are reset