; and (2) in subsection (b)— (A) in paragraph (1), by striking 4 years after the date of enactment of this Act and inserting 2 years after the date of enactment of the Water Infrastructure Finance and Innovation Reauthorization Act of 2017 ; and (B) in paragraph (2)(B)(i), by striking Secretary or the Administrator, as applicable, and inserting Administrator .