--- a/make/Images.gmk	Mon Jun 26 17:00:45 2017 +0200
+++ b/make/Images.gmk	Tue Oct 17 15:46:09 2017 +0200
@@ -324,9 +324,8 @@
 
   DEMO_FILES := \
       $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
-        $(call DoubleDollar, \
         $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
-            -type f -a ! \( -name "_the*" -o -name "javac_state" \) )) \
+            -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \
       )
 
   ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)