; (B) in paragraph (2), by striking in subparagraph (A), (B), or (C) of paragraph (1) and inserting in subparagraph (A) or (F) of paragraph (1) ; and (C) in paragraph (4), by inserting not later than June 30, 2024, and after The Secretary may provide, ; and (2) in subsection (e), by adding at the end the following: (9) Revised Pay As You Earn Repayment plan (A) In general The Secretary shall carry out a Revised Pay As You Earn Repayment plan in accordance with section 685.209(c) of title 34, Code of Federal Regulations, as in effect on December 17, 2015, except as otherwise provided in this paragraph as follows: (i) A borrower may complete loan rehabilitation on a defaulted loan through making eligible payments in accordance with this paragraph for 9 consecutive months. (ii) A borrower who no longer wishes to repay under the Revised Pay As You Earn Repayment plan may change only to a standard repayment plan. (iii) In addition to that provided under paragraph (5)(iv) of such section 685.209(c), a qualifying monthly payment may also include a month for which the borrower received— (I) deferment under subsection (f)(3) due to receiving treatment for cancer; (II) deferment under subsection (f)(2) for rehabilitation training; (III) deferment under subsection (f)(2) for unemployment; (IV) deferment under subsection (f)(2) for economic hardship, including any period of deferment for Peace Corps service; (V) deferment under subsection (f)(2) for military service; (VI) deferment under subsection (f)(2) for post-active duty service; (VII) forbearance under section 428(c)(3)(A)(i)(III), for national service; (VIII) forbearance under section 685.205(a)(7) of title 34, Code of Federal Regulations, for National Guard Duty; (IX) forbearance under section 428(c)(3)(A)(i)(IV), for service for which the borrower would qualify for a partial repayment of his or her loan under the Student Loan Repayment Programs administered by the Department of Defense