; and (B) in subsection (e)(3)— (i) in subparagraph (A), by striking , including any applicable locality-based comparability payment that may be authorized under section 5304(h)(2)(C) of such title ; and (ii) in subparagraph (B), by striking , including any applicable locality-based comparability payment, . (8) Section 436(b) of the Energy Independence and Security Act of 2007 ( 42 U.S.C. 17092(b) ) is amended by striking , including any applicable locality-based comparability payment that may be authorized under section 5304(h)(2)(C) of that title . (e) Annuity shortfalls The Secretary of the Treasury shall pay from the General Fund of the Treasury into the Civil Service Retirement and Disability Fund established under section 8348 of title 5, United States Code, the amount determined by the Director of the Office of Personnel Management to be necessary to reimburse the Fund for any estimated increase resulting from this Act or the amendments made by this Act in— (1) the unfunded liability of the Civil Service Retirement and Disability Fund (as defined in section 8331 of title 5, United States Code); and (2) the supplemental liability of such Fund (as defined in section 8401 of title 5, United States Code).