Revert "Fix cb linkage"

This reverts commit 4defc8147e78ab6b4c01521359264db06c28dc39.
Revert "Remove cb projects"

This reverts commit db679b154ba862d734e2dcd87ee7407dca8c327a.