Merge "Revert "Create a buffer independent cb_handle_t base class""