Revert AddCallbackAdapter fix??