Fix last bit of a missed merge.