diff --git a/s/cptypes.ss b/s/cptypes.ss
index dd304d6e5b..748ed59e22 100644
--- a/s/cptypes.ss
+++ b/s/cptypes.ss
@@ -931,6 +931,7 @@ Notes:
                  [else
                   (values `(call ,preinfo ,pr ,n) ret ntypes #f #f)]))])
 
+      #;
       (define-specialize/unrestricted 2 call-with-values
         [(e1 e2) (let-values ([(e1 ret1 types1 t-types1 f-types1)
                                (Expr/call e1 'value oldtypes oldtypes)])
diff --git a/s/primdata.ss b/s/primdata.ss
index 5fbc2c7511..f645b9bde0 100644
--- a/s/primdata.ss
+++ b/s/primdata.ss
@@ -341,7 +341,7 @@
   (call-with-current-continuation [sig [(procedure) -> (ptr ...)]] [flags ieee r5rs])
   (call/cc [sig [(procedure) -> (ptr ...)]] [flags])
   (values [sig [(ptr ...) -> (ptr ...)]] [flags unrestricted discard cp02 ieee r5rs])
-  (call-with-values [sig [(procedure procedure) -> (ptr ...)]] [flags cp02 cptypes2x ieee r5rs])
+  (call-with-values [sig [(procedure procedure) -> (ptr ...)]] [flags cp02 #;cptypes2x ieee r5rs])
   ((r6rs: dynamic-wind) [sig [(procedure procedure procedure) -> (ptr ...)]] [flags cptypes2x ieee r5rs])      ; restricted to 3 arguments
 )