; or (BB) in the case of a payment described in clause (i)(II), in equal proportion to such payment; and (bb) is deemed to have one additional year of service. (II) Other lump-sum payment recipients Notwithstanding any other provision of law, the restoration of the rights of an impacted Federal employee under subclause (I) shall not— (aa) reinstate the rights of an individual under chapter 83 or 84 of title 5, United States Code, that were voided or fulfilled by the receipt of or becoming entitled to a lump-sum payment under chapter 83 or 84 of title 5, United States Code, other than a lump-sum payment under section 8343a or 8420a of such title, after the date on which such impacted Federal employee became an impacted Federal employee that was based in full or in part on the service of such impacted Federal employee before such date; or (bb) entitle an individual described in item (aa) to any other payment or annuity under chapter 83 or 84 of such title. (iii) Entitlement waiver For the purposes of clause (i), the waiver of a right to the payment of a lump-sum credit under section 8342 or 8424 of title 5, United States Code, is deemed to be a payment to the Treasury of the United States to the credit of the Fund equal to the amount of such lump-sum credit. (iv) Withholdings and Government contributions Subparagraphs (B), (C), and (D) of paragraph (1) shall apply with respect to an impacted Federal employee who makes the election described in clause (i) as if such impacted Federal employee is an impacted Federal employee described in paragraph (1)(E). (v) Payment timing An impacted Federal employee that makes the election under clause (i) must make the payment described in such clause not later than one year after making such election. (vi) Impacted Federal employee described An impacted Federal employee described in this clause is an impacted Federal employee that— (I) selects payment under section 2(a)(2) or is entitled to payment under section 2(b)