Add back PCF now that the conflict is fixed