Revert signature change from CB back to vanilla. Fixes #161.