You'll need to fix this up again after you merge your cpp-common branch to master.