This reverts commit 2347b8efef1f031b8bdfc3f47b157134c878dd1b. Conflicts: conf/intel/portage/package.unmask