Fixed breakage after merge.