Change the memleak fix so that no callbacks need disabling