Fix fallout of testing merge.