Another attempt at fixing the CFAcc build issue