Fix an internal build failure after r239014