Revert ext-cb removal, as we need it.