Make callback declaration match one used in trunk.