more surgery

Package-Manager: portage-2.2.0_alpha163