diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
index cc6ed4c042..82ae968ebd 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
@@ -21,7 +21,7 @@ SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="cros-debug cros_host -delta_generator symlink-usr"
+IUSE="cros_host +debug -delta_generator symlink-usr"
 
 RDEPEND="!coreos-base/coreos-installer
 	app-arch/bzip2
@@ -62,7 +62,7 @@ src_configure() {
 	append-flags -Wno-unused-function
 
 	local myconf=(
-		$(use_enable cros-debug debug)
+		$(use_enable debug)
 		$(use_enable delta_generator)
 	)
 
diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass
deleted file mode 100644
index 04e48f1b9a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# Original Author: The Chromium OS Authors <chromium-os-dev@chromium.org>
-# Purpose: Set -DNDEBUG if the cros-debug USE flag is not defined.
-#
-
-inherit flag-o-matic
-
-IUSE="cros-debug"
-
-cros-debug-add-NDEBUG() {
-  use cros-debug || append-flags -DNDEBUG
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
index 2dc7a037d2..b2e42a0e2f 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
@@ -1,7 +1,7 @@
 # Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="cros-debug acpi usb symlink-usr cryptsetup policykit"
+USE="acpi usb symlink-usr cryptsetup policykit"
 USE="${USE} -split-usr -cros_host -expat -cairo -X -man"
 USE="${USE} -acl -gpm -python"
 USE="${USE} -fortran -abiword -perl -cups -poppler-data"