diff --git a/collects/typed-scheme/base-env/prims.rkt b/collects/typed-scheme/base-env/prims.rkt
index 8ddc9d64..6829ab5d 100644
--- a/collects/typed-scheme/base-env/prims.rkt
+++ b/collects/typed-scheme/base-env/prims.rkt
@@ -19,10 +19,11 @@ This file defines two sorts of primitives. All of them are provided into any mod
 |#
 
 
-(provide (except-out (all-defined-out) dtsi* let-internal: define-for-variants define-for*-variants)
+(provide (except-out (all-defined-out) dtsi* let-internal: define-for-variants define-for*-variants with-handlers: for/annotation for*/annotation)
          :
 	 (rename-out [define-typed-struct define-struct:]
                      [lambda: λ:]
+                     [with-handlers: with-handlers]
                      [define-typed-struct/exec define-struct/exec:]
                      [for/annotation for]
                      [for*/annotation for*]))
diff --git a/collects/typed-scheme/main.rkt b/collects/typed-scheme/main.rkt
index 4bfed909..b8e4b085 100644
--- a/collects/typed-scheme/main.rkt
+++ b/collects/typed-scheme/main.rkt
@@ -7,10 +7,8 @@
          typed-scheme/base-env/base-types
          typed-scheme/base-env/base-types-extra
 	 (for-syntax typed-scheme/base-env/base-types-extra))
-(provide (rename-out [with-handlers: with-handlers]
-                     [define-type-alias define-type])
-         (except-out (all-from-out typed-scheme/base-env/prims)
-                     with-handlers: for/annotation for*/annotation)
+(provide (rename-out [define-type-alias define-type])
+         (all-from-out typed-scheme/base-env/prims)
          (all-from-out typed-scheme/base-env/base-types)
          (all-from-out typed-scheme/base-env/base-types-extra)
 	 assert defined? with-type for for*
diff --git a/collects/typed-scheme/private/with-types.rkt b/collects/typed-scheme/private/with-types.rkt
index b79178c0..30e951c8 100644
--- a/collects/typed-scheme/private/with-types.rkt
+++ b/collects/typed-scheme/private/with-types.rkt
@@ -2,10 +2,10 @@
 
 (require racket/require
          (for-template
-          (except-in racket/base for for*)
+          (except-in racket/base for for* with-handlers)
           "../base-env/prims.rkt"
           (prefix-in c: (combine-in racket/contract/region racket/contract/base)))
-         "../base-env/extra-procs.rkt" "../base-env/prims.rkt"
+         "../base-env/extra-procs.rkt" (except-in "../base-env/prims.rkt" with-handlers)
          "../tc-setup.rkt"
          syntax/parse racket/block racket/match
          unstable/sequence  "../base-env/base-types-extra.rkt"
diff --git a/collects/typed/racket/base.rkt b/collects/typed/racket/base.rkt
index c39cfe20..84c0ea8f 100644
--- a/collects/typed/racket/base.rkt
+++ b/collects/typed/racket/base.rkt
@@ -8,10 +8,8 @@
          typed-scheme/base-env/base-types
          typed-scheme/base-env/base-types-extra
 	 (for-syntax typed-scheme/base-env/base-types-extra))
-(provide (rename-out [with-handlers: with-handlers]
-                     [define-type-alias define-type])
-         (except-out (all-from-out typed-scheme/base-env/prims)
-                     with-handlers: for/annotation for*/annotation)
+(provide (rename-out [define-type-alias define-type])
+         (all-from-out typed-scheme/base-env/prims)
          (all-from-out typed-scheme/base-env/base-types)
          (all-from-out typed-scheme/base-env/base-types-extra)
 	 assert defined? with-type for for*
diff --git a/collects/typed/scheme/base.rkt b/collects/typed/scheme/base.rkt
index ba2146a2..9c056889 100644
--- a/collects/typed/scheme/base.rkt
+++ b/collects/typed/scheme/base.rkt
@@ -8,10 +8,8 @@
          typed-scheme/base-env/base-types
          typed-scheme/base-env/base-types-extra
 	 (for-syntax typed-scheme/base-env/base-types-extra))
-(provide (rename-out [with-handlers: with-handlers]
-                     [define-type-alias define-type])
-         (except-out (all-from-out typed-scheme/base-env/prims)
-                     with-handlers: for/annotation for*/annotation)
+(provide (rename-out [define-type-alias define-type])
+         (all-from-out typed-scheme/base-env/prims)
          (all-from-out typed-scheme/base-env/base-types)
          (all-from-out typed-scheme/base-env/base-types-extra)
 	 assert defined? with-type for for*