Rollback memento to use old cpp-common