Temporarily remove conflict with ccgcommon