Missed a line from a bad merge in r390122