Unreviewed buildfix after merge.