; or (hh) required involuntary commitment to a psychiatric hospital for any reason, including drug use; and (ii) does not include— (I) a person who is in a psychiatric hospital for observation; or (II) a voluntary admission to a psychiatric hospital. (B) In this paragraph, the term order or finding does not include— (i) an order or finding that has expired or has been set aside or expunged; (ii) an order or finding that is no longer applicable because a judicial officer, court, board, commission, or other adjudicative body has found that the person who is the subject of the order or finding— (I) does not present a danger to himself or to others; (II) has been restored to sanity or cured of mental disease or defect; (III) has been restored to competency; or (IV) no longer requires involuntary inpatient or outpatient treatment by, or involuntary commitment to, a psychiatric hospital; or (iii) an order or finding with respect to which the person who is subject to the order or finding has been granted relief from disabilities under section 925(c) or under a program described in section 101(c)(2)(A) or 105 of the NICS Improvement Amendments Act of 2007 ( 18 U.S.C. 922 note). (37) The term psychiatric hospital includes a mental health facility, a mental hospital, a sanitarium, a psychiatric facility, and any other facility that provides diagnoses by licensed professionals of mental retardation or mental illness, including a psychiatric ward in a general hospital. ; and (2) in section 922— (A) in subsection (d)(4)— (i) by striking as a mental defective and inserting mentally incompetent ; and (ii) by striking any mental institution and inserting a psychiatric hospital ; and (B) in subsection (g)(4)— (i) by striking as a mental defective or who has and inserting mentally incompetent or has