diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
index 123bddf7eb..8de75eb292 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
@@ -2,23 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Get the current SDK version, useful for fetching the latest packages
-source "/mnt/host/source/.repo/manifests/version.txt"
-COREOS_VERSION_STRING="${COREOS_BUILD}.${COREOS_BRANCH}.${COREOS_PATCH}"
-
 # Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] }
 source make.conf.board_setup
 
 # Common settings across all board targets.
 source make.conf.common
 
-PORTAGE_BINHOST="
-    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_VERSION_STRING}/pkgs/
-    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_VERSION_STRING}/toolchain/
-    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_SDK_VERSION}/pkgs/
-    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_SDK_VERSION}/toolchain/
-"
-
 # Recommended MARCH_TUNE, CFLAGS, etc.
 MARCH_TUNE=""
 
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
index fff6df3ac4..09da7ea27e 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -82,3 +82,6 @@
 
 # Hopefully includes some certs folks have been missing
 =app-misc/ca-certificates-20130906 ~amd64
+
+# Kills an annoying warning
+=app-admin/eselect-1.4