diff --git a/e17/elementary/elementary.conf b/e17/elementary/elementary.conf
index 2c38cb83b..7927faada 100644
--- a/e17/elementary/elementary.conf
+++ b/e17/elementary/elementary.conf
@@ -13,18 +13,4 @@
 # --- SDE-COPYRIGHT-NOTE-END ---
 
 var_append extraconfopt ' ' '--with-eet-eet=eet'
-
-if atstage cross; then
-	# we don't have edje_cc here, so pass this ball to runtime
-	install_raw_themes() {
-		local ext= f= d="$root$docdir"
-		for ext in desktop edc gif jpg png; do
-			find data/ -type f -name *.$ext | while read f; do
-				mkdir -p "$d/${f%/*}"
-				cp "$f" "$d/$f"
-			done
-		done
-	}
-
-	hook_add postmake 5 'install_raw_themes'
-fi
+var_append extraconfopt ' ' '--with-edje-cc=edje_cc'
diff --git a/e17/elementary/no_themes.patch.cross b/e17/elementary/no_themes.patch.cross
deleted file mode 100644
index 2ea75c4f1..000000000
--- a/e17/elementary/no_themes.patch.cross
+++ /dev/null
@@ -1,26 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../elementary/no_themes.patch.cross
-# Copyright (C) 2010 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-data/* needs to run edje_cc
-
---- ./Makefile.am.orig	2010-02-21 19:29:37.000000000 -0500
-+++ ./Makefile.am	2010-09-20 18:07:50.000000000 -0400
-@@ -1,4 +1,4 @@
--SUBDIRS = src data config doc
-+SUBDIRS = src config doc
- 
- ACLOCAL_AMFLAGS = -I m4
-