; and (B) by striking paragraph (4). (2) FISA Amendments Reauthorization Act of 2017 Section 103 of the FISA Amendments Reauthorization Act of 2017 ( Public Law 115–118 ; 50 U.S.C. 1881a note) is amended— (A) by striking subsection (b); and (B) by striking (a) In general.— . 23. Inclusion of counternarcotics in definition of foreign intelligence Section 101(e)(1) is amended— (1) in subparagraph (B), by striking ; or and inserting a semicolon; and (2) by adding at the end the following new subparagraph: (D) international production, distribution, or financing of illicit synthetic drugs, opioids, cocaine, or other drugs driving overdose deaths, or precursors of any aforementioned; or . 24. Vetting of non-United States persons Subsection (f) of section 702, as amended by this Act, is further amended by adding at the end the following new paragraph: (6) Vetting of non-United States persons For any procedures for one or more agencies adopted under paragraph (1)(A), the Attorney General, in consultation with the Director of National Intelligence, shall ensure that the procedures enable the vetting of all non-United States persons who are being processed for travel to the United States using terms that do not qualify as United States person query terms under this Act. . 25. Definition of electronic communication service provider (a) Section 701(b)(4) is amended— (1) by redesignating subparagraph (E) as subparagraph (F); (2) in subparagraph (D), by striking ; or and inserting a semicolon; (3) by inserting after subparagraph (D) the following new subparagraph: (E) any other service provider who has access to equipment that is being or may be used to transmit or store wire or electronic communications, but not including any entity that serves primarily as— (i) a public accommodation facility, as that term is defined in section 501(4); (ii) a dwelling, as that term is defined in section 802 of the Fair Housing Act ( 42 U.S.C. 3602 )