diff --git a/racket/src/ChezScheme/mats/cp0.ms b/racket/src/ChezScheme/mats/cp0.ms
index ca81492c9a..b00253a2de 100644
--- a/racket/src/ChezScheme/mats/cp0.ms
+++ b/racket/src/ChezScheme/mats/cp0.ms
@@ -3232,3 +3232,93 @@
       (expand/optimize '((make-arity-wrapper-procedure (lambda (x) x) 1 'ok) 5)))
     5))
   )
+
+(mat uncprep-app-variants
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(x y))
+     '(x y)))
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#%$app x y))
+     '(x y)))
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app x y))
+     (if (eqv? 3 (optimize-level))
+         '(x y)
+         '(#3%$app x y))))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(x y))
+     '(x y)))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app x y))
+     '(x y)))
+
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#%$app/no-return x y))
+     '($app/no-return x y)))
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app/no-return x y))
+     (if (eqv? 3 (optimize-level))
+         '($app/no-return x y)
+         '(#3%$app/no-return x y))))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#%$app/no-return x y))
+     '($app/no-return x y)))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app/no-return x y))
+     '($app/no-return x y)))
+
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#%$app/no-inline x y))
+     '($app/no-inline x y)))
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app/no-inline x y))
+     (if (eqv? 3 (optimize-level))
+         '($app/no-inline x y)
+         '(#3%$app/no-inline x y))))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#%$app/no-inline x y))
+     '($app/no-inline x y)))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app/no-inline x y))
+     '($app/no-inline x y)))
+
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#%$app/value x y))
+     '($app/value x y)))
+  (parameterize ([enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app/value x y))
+     (if (eqv? 3 (optimize-level))
+         '($app/value x y)
+         '(#3%$app/value x y))))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#%$app/value x y))
+     '($app/value x y)))
+  (parameterize ([enable-unsafe-application #t]
+                 [enable-cp0 #t])
+    (equivalent-expansion?
+     (expand/optimize '(#3%$app/value x y))
+     '($app/value x y)))
+)
diff --git a/racket/src/ChezScheme/s/cprep.ss b/racket/src/ChezScheme/s/cprep.ss
index 5c7a6cbff2..711aaf3e21 100644
--- a/racket/src/ChezScheme/s/cprep.ss
+++ b/racket/src/ChezScheme/s/cprep.ss
@@ -178,7 +178,7 @@
                              [(preinfo-call-can-inline? preinfo)
                               (prim #f a)]
                              [else
-                              (prim '$app/no-inline)])))])))]
+                              (prim '$app/no-inline a)])))])))]
                [,pr (let ([sym (primref-name pr)])
                       (if sexpr?
                           ($sgetprop sym '*unprefixed* sym)