Revert rogue change
Take cpp-common at master