Fix issue #296. There may be further work as I think we have a real upstream now.

Package-Manager: portage-2.2.10