diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/package.use.force
index aafa196b0c..e69de29bb2 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/package.use.force
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/package.use.force
@@ -1,2 +0,0 @@
-# Do not force this flag, we don't need XATTR_PAX
-sys-apps/portage -xattr
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force
index 3d5dc12d3b..952d0233bd 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force
@@ -1,6 +1,3 @@
-# Do not force this flag, we don't need XATTR_PAX
-sys-apps/portage -xattr
-
 sys-auth/polkit -introspection
 sys-apps/systemd -introspection
 sys-fs/udev-init-scripts -introspection
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
index 5c27e283ec..5196ea6a52 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
@@ -79,3 +79,5 @@ dev-cpp/glog gflags
 # enable rpc for rpc.rquotad
 sys-fs/quota rpc
 
+# Don't bother building portage w/xattr, we don't need XATTR_PAX
+sys-apps/portage -xattr
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force
index bd6530bb7e..b642673c60 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force
@@ -1,2 +1,5 @@
 # Copyright (c) 2014 The CoreOS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
+
+# Do not force this flag, we don't need XATTR_PAX
+sys-apps/portage -xattr