Revert "BoardConfig: Don't use c2d composition"

This reverts commit 9983aa02c11f9a4319217ab77769788331c83bfc.