1. Short title This Act may be cited as the Federal Employee Pension Fairness Act of 2017 . 2. Repeal of FERS revised and further revised annuitant categories (a) Repeal of annuity computation Section 8415 of title 5, United States Code, is amended by striking subsection (d). (b) Repeal of annuitant categories Section 8422(a)(3) of title 5, United States Code, is amended— (1) by striking other than revised annuity employees or further revised annuity employees ; and (2) by striking subparagraphs (B) and (C). (c) Repeal of Government contributions Section 8423(a) of title 5, United States Code, is amended by striking paragraph (2) and inserting the following: (2) In determining any normal-cost percentage to be applied under this subsection, amounts provided for under section 8422 shall be taken into account. . (d) Conforming amendments Section 8401 of title 5, United States Code, is amended— (1) in paragraph (35)(B), by striking the semi-colon at the end and inserting ; and ; (2) in paragraph (36), by striking ; and at the end and inserting a period