Fix build after merge.