Well, I think if we ship #6044 first, we really just need the callback code from #6197