The words “Administrator of General Services” are substituted for “Commissioner of Public Buildings” because of section 103(a) of the Federal Property and Administrative Services Act of 1949 (ch. 288, 63 Stat. 380), which is restated as section 303(c) [303(b)] of the revised title. The words “in and outside the District of Columbia” are omitted as unnecessary. The words “United States Postal Service” are substituted for “Post Office Department” because of section 6(o) of the Postal Reorganization Act (Public Law 91–375, 84 Stat. 783).