Fix code leak from cherry-picking.