diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
index 7c6fafd41f..4cd4833821 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
@@ -84,11 +84,6 @@ update_bootengine_cpio() {
 
 kmake() {
 	local kernel_arch=$(tc-arch-kernel)
-	# Disable hardened PIE explicitly, >=ccache-3.2 breaks the hardened
-	# compiler's auto-detection of kernel builds.
-	if gcc-specs-pie; then
-		set -- KCFLAGS=-nopie "$@"
-	fi
 	emake ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@"
 }
 
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 280ba1d25e..8814d6f761 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
@@ -112,6 +112,3 @@ dev-util/checkbashisms
 
 # >=3.16 required by docker 1.4
 =sys-fs/btrfs-progs-3.17.1
-
-# ccache 3.1.9 (current stable) has a locking bug
-=dev-util/ccache-3.2.1-r1