I thought you said you moved this logic to the place where the callbacks are registered, did you forget to check that in?