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 2ab0303fdb..65d685906b 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
@@ -54,39 +54,21 @@ INSTALL_MASK="${INSTALL_MASK}
 
   /usr/lib/modules/*-coreos/source/scripts/*.pl
 
-  /usr/share/git/contrib/*
-
   /usr/share/rsync/*
 
-  /usr/bin/diff-highlight
   /usr/bin/glib-mkenums
   /usr/bin/afmtodit
   /usr/bin/decode-edid
-  /usr/bin/autoscan-2.13
   /usr/bin/gtkdoc-rebase
   /usr/bin/ddcmon
   /usr/bin/mtrace
-  /usr/bin/autoupdate-2.69
-  /usr/bin/autoreconf-2.69
-  /usr/bin/automake-1.14
   /usr/bin/import-tars
-  /usr/bin/autom4te-2.69
   /usr/bin/help2man
   /usr/bin/gropdf
   /usr/bin/mmroff
-  /usr/bin/autoheader-2.69
   /usr/bin/decode-dimms
-  /usr/bin/aclocal-1.14
   /usr/bin/pdfmom
-  /usr/bin/aclocal-1.15
   /usr/bin/decode-vaio
-  /usr/bin/ifnames-2.69
-  /usr/bin/automake-1.15
-  /usr/bin/intltool-update
-  /usr/bin/intltool-merge
-  /usr/bin/intltool-prepare
-  /usr/bin/intltool-extract
-  /usr/bin/autoscan-2.69
   /etc/ssl/misc/CA.pl
   /etc/ssl/misc/tsget
 "
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
index fa646a530f..34c17793d5 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
@@ -26,3 +26,24 @@ INSTALL_MASK="${INSTALL_MASK}
   /usr/share/ncat
   /usr/share/nmap
 "
+
+# Remove files which depend on interpreters not present in boards.
+INSTALL_MASK="${INSTALL_MASK}
+  /usr/share/git/contrib/*
+  /usr/bin/diff-highlight
+  /usr/bin/autoscan-2.13
+  /usr/bin/autoupdate-2.69
+  /usr/bin/autoreconf-2.69
+  /usr/bin/automake-1.14
+  /usr/bin/autom4te-2.69
+  /usr/bin/autoheader-2.69
+  /usr/bin/aclocal-1.14
+  /usr/bin/aclocal-1.15
+  /usr/bin/automake-1.15
+  /usr/bin/ifnames-2.69
+  /usr/bin/intltool-update
+  /usr/bin/intltool-merge
+  /usr/bin/intltool-prepare
+  /usr/bin/intltool-extract
+  /usr/bin/autoscan-2.69
+"