Some missed code during the merge.